Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-07-16 08:06:22 -0400
committerOlivier Constant2019-07-16 08:06:22 -0400
commitcd82bef6401c91860c48219f0a243599dc55887b (patch)
tree46d8efb118e10d81cf9490f1873210e074b49369
parentcfd2e6802e77f1a2a6b1a66061e8a2994eaa7e71 (diff)
parent363ff1d41ca4bc3ae293209906135f55ab3ddb33 (diff)
downloadorg.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.tar.gz
org.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.tar.xz
org.eclipse.emf.diffmerge.core-cd82bef6401c91860c48219f0a243599dc55887b.zip
Merge branch '0.11.x'
Conflicts: releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product Change-Id: I9711d30d104f3fb7e63e125e1a7400d6d0b4f246 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.emf.diffmerge.doc/pom.xml2
-rw-r--r--doc/pom.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/.project34
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/.project34
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.svn.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.tests.feature/.project34
-rw-r--r--features/org.eclipse.emf.diffmerge.tests.feature/feature.xml2
-rw-r--r--features/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java3
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java8
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java25
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java68
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java16
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java8
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java38
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java21
-rw-r--r--plugins/org.eclipse.emf.diffmerge/.project56
-rw-r--r--plugins/org.eclipse.emf.diffmerge/.settings/org.eclipse.jdt.ui.prefs18
-rw-r--r--plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF2
-rw-r--r--plugins/pom.xml2
-rw-r--r--pom.xml4
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml4
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product4
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/category.xml10
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/pom.xml2
-rw-r--r--releng/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.customization/.classpath14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.customization/.project56
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.customization/.settings/org.eclipse.jdt.core.prefs14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.edit/.classpath14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.edit/.project56
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.edit/.settings/org.eclipse.jdt.core.prefs178
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.editor/.classpath14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.editor/.project56
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.editor/.settings/org.eclipse.jdt.core.prefs180
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsActionBarContributor.java846
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsEditorPlugin.java182
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsModelWizard.java1254
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements/.classpath14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements/.project56
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.elements/.settings/org.eclipse.jdt.core.prefs198
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/.project11
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/.project44
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/.project22
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex1.elements30
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex2.elements24
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex1.elements30
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex2.elements8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex1.elements12
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex2.elements8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex1.elements16
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex2.elements4
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex1.elements16
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex2.elements8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex1.elements14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex2.elements14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex1.elements12
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex2.elements8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex1.elements14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex2.elements8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex1.elements14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex2.elements8
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F0.elements10
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F1.elements12
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F2.elements12
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex1.elements30
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex2.elements10
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex1.elements14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex2.elements18
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex1.elements20
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex2.elements24
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.workspace/build.properties2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/.classpath14
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project56
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/.settings/org.eclipse.jdt.core.prefs16
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/EDM-WT-Tests.launch78
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/Activator.java60
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/TestUtil.java52
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/Graph.java102
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/HierarchyAddition.java180
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditions.java112
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsMandatory.java176
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsNested.java132
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MandatoryRefChange.java130
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MovedInAdded.java164
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAddition.java104
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAdditionOpposites.java104
-rw-r--r--tests/pom.xml2
124 files changed, 3042 insertions, 2944 deletions
diff --git a/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF
index ba0617b6..738a66d0 100644
--- a/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.doc;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
diff --git a/doc/org.eclipse.emf.diffmerge.doc/pom.xml b/doc/org.eclipse.emf.diffmerge.doc/pom.xml
index 6b78b491..ef939131 100644
--- a/doc/org.eclipse.emf.diffmerge.doc/pom.xml
+++ b/doc/org.eclipse.emf.diffmerge.doc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.docs</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<properties>
diff --git a/doc/pom.xml b/doc/pom.xml
index 851f9301..e4cd81f5 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/.project b/features/org.eclipse.emf.diffmerge.egit.feature/.project
index cf319295..21243d64 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/.project
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.egit.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.egit.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index 87a97b7b..39ac2a2a 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.xml b/features/org.eclipse.emf.diffmerge.feature/feature.xml
index a745bb17..5489cf4c 100644
--- a/features/org.eclipse.emf.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
index 2d36e9ef..f780690b 100644
--- a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.gmf.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/.project b/features/org.eclipse.emf.diffmerge.sdk.feature/.project
index 60eed7fb..6f72db79 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/.project
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.sdk.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.sdk.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 82f4b363..03225e71 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.sdk.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
index c8cef9ac..1f429896 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.sirius.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
index 28ec2708..50790ed4 100644
--- a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.svn.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.tests.feature/.project b/features/org.eclipse.emf.diffmerge.tests.feature/.project
index 0892687a..358029aa 100644
--- a/features/org.eclipse.emf.diffmerge.tests.feature/.project
+++ b/features/org.eclipse.emf.diffmerge.tests.feature/.project
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
index ae924ce7..b00553eb 100644
--- a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.tests.feature"
label="%featureName"
- version="0.11.0.qualifier"
+ version="0.11.2.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/pom.xml b/features/pom.xml
index 0786a3d6..5500c202 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<build>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/.project b/plugins/org.eclipse.emf.diffmerge.connector.core/.project
index 0ae122b5..f71e27aa 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/.project
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.connector.core</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.connector.core</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.connector.core/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF
index 90363913..99a735d6 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.core;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java
index 1ecc70d8..8335508c 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/src/org/eclipse/emf/diffmerge/connector/core/ext/AbstractURIConvertingScopeDefinitionFactory.java
@@ -35,7 +35,8 @@ import org.eclipse.emf.ecore.resource.URIConverter;
* the URI. The scope definition obtained through that factory is wrapped into a dedicated
* scope definition that alters its behavior through a URIConverter.
*/
-public abstract class AbstractURIConvertingScopeDefinitionFactory extends URIScopeDefinitionFactory {
+public abstract class AbstractURIConvertingScopeDefinitionFactory
+extends URIScopeDefinitionFactory implements IModelScopeDefinitionFactory.Delegating {
/**
* @see org.eclipse.emf.diffmerge.ui.specification.ext.URIScopeDefinitionFactory#createScopeDefinition(java.lang.Object, java.lang.String, boolean)
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/.project b/plugins/org.eclipse.emf.diffmerge.connector.git/.project
index 8d7130ad..c7650fe9 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/.project
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.connector.git</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.connector.git</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.connector.git/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
index 299fdbb3..ea955e9c 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.git;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java
index 506e1ba6..d53f2c22 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitHelper.java
@@ -17,14 +17,12 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collection;
-import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.project.RepositoryMapping;
-import org.eclipse.egit.ui.internal.revision.LocalFileRevision;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.diffmerge.connector.git.EMFDiffMergeGitConnectorPlugin;
import org.eclipse.emf.diffmerge.connector.git.Messages;
@@ -101,9 +99,6 @@ public final class GitHelper {
IPath revisionPath = toPath(revision_p);
if (revisionPath != null && !revisionPath.isAbsolute()) {
return getRepository(revisionPath);
- } else if (revision_p instanceof LocalFileRevision) {
- IFile file = ((LocalFileRevision)revision_p).getFile();
- return getRepository(file.getFullPath());
}
EMFDiffMergeGitConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
EMFDiffMergeGitConnectorPlugin.getDefault().getPluginId(),
@@ -170,9 +165,6 @@ public final class GitHelper {
IPath revisionPath = toPath(revision_p);
if (!revisionPath.isAbsolute()) {
return isConflicting(repository_p, revisionPath.toString());
- } else if (revision_p instanceof LocalFileRevision) {
- IFile file = ((LocalFileRevision)revision_p).getFile();
- return isConflicting(repository_p, file.getFullPath().makeRelative().toString());
}
EMFDiffMergeGitConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
EMFDiffMergeGitConnectorPlugin.getDefault().getPluginId(),
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java
index efa8a2b5..823fdfea 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/src/org/eclipse/emf/diffmerge/connector/git/ext/GitIndexRevisionScopeDefinitionFactory.java
@@ -22,10 +22,8 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.egit.core.internal.storage.IndexFileRevision;
import org.eclipse.egit.ui.internal.revision.EditableRevision;
-import org.eclipse.egit.ui.internal.revision.LocalFileRevision;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory;
-import org.eclipse.emf.diffmerge.connector.core.ext.LocalHistoryURIConverter;
import org.eclipse.emf.diffmerge.connector.git.EMFDiffMergeGitConnectorPlugin;
import org.eclipse.emf.diffmerge.connector.git.Messages;
import org.eclipse.emf.ecore.resource.URIConverter;
@@ -57,10 +55,6 @@ public class GitIndexRevisionScopeDefinitionFactory extends AbstractRevisionScop
Messages.GitIndexRevisionScopeDefinitionFactory_LabelIndexReadOnly,
revision_p.getName());
}
- } else if (revision_p instanceof LocalFileRevision) {
- result = String.format(
- Messages.GitIndexRevisionScopeDefinitionFactory_LabelLocal,
- getLocalFileRevisionPath((LocalFileRevision)revision_p));
}
}
if (result == null)
@@ -69,15 +63,6 @@ public class GitIndexRevisionScopeDefinitionFactory extends AbstractRevisionScop
}
/**
- * Return the path of the given local file revision
- * @param revision_p a non-null object
- * @return a non-null object
- */
- protected String getLocalFileRevisionPath(LocalFileRevision revision_p) {
- return revision_p.getFile().getFullPath().toString();
- }
-
- /**
* @see org.eclipse.emf.diffmerge.connector.core.ext.AbstractRevisionScopeDefinitionFactory#getRevision(org.eclipse.compare.ITypedElement)
*/
@Override
@@ -112,14 +97,6 @@ public class GitIndexRevisionScopeDefinitionFactory extends AbstractRevisionScop
EMFDiffMergeGitConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
}
}
- if (revision_p instanceof LocalFileRevision) {
- String fullPath = getLocalFileRevisionPath((LocalFileRevision)revision_p);
- // Local history or current
- final long timestamp = revision_p.getTimestamp();
- if (timestamp != -1) {
- return new LocalHistoryURIConverter(timestamp, fullPath);
- }
- }
return null;
}
@@ -143,8 +120,6 @@ public class GitIndexRevisionScopeDefinitionFactory extends AbstractRevisionScop
EMFDiffMergeGitConnectorPlugin.getDefault().getLog().log(new Status(IStatus.ERROR,
EMFDiffMergeGitConnectorPlugin.getDefault().getPluginId(), e.getMessage(), e));
}
- } else if (revision_p instanceof LocalFileRevision) {
- result = URI.createPlatformResourceURI(getLocalFileRevisionPath((LocalFileRevision)revision_p), true);
}
return result;
}
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/.project b/plugins/org.eclipse.emf.diffmerge.connector.svn/.project
index 084f3947..fa47055b 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/.project
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.connector.svn</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.connector.svn</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.connector.svn/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
index e03e5f61..c04c01a5 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.svn;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/.project b/plugins/org.eclipse.emf.diffmerge.gmf/.project
index 2e44a547..aa6a5f41 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/.project
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.gmf</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.gmf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.gmf/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF
index fc57da51..92c79610 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.gmf;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.gmf.GMFDiffMergePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF
index ff2e1f88..1eb5fdfa 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.sirius;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.sirius.SiriusDiffMergePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
index 41f77a56..b3e571c7 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/src/org/eclipse/emf/diffmerge/sirius/SiriusScope.java
@@ -19,6 +19,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.diffmerge.gmf.GMFScope;
import org.eclipse.emf.diffmerge.structures.common.FArrayList;
@@ -32,6 +33,8 @@ import org.eclipse.gmf.runtime.notation.NotationPackage;
import org.eclipse.sirius.business.api.helper.SiriusUtil;
import org.eclipse.sirius.business.api.query.DRepresentationQuery;
import org.eclipse.sirius.business.api.resource.ResourceDescriptor;
+import org.eclipse.sirius.business.api.session.Session;
+import org.eclipse.sirius.business.api.session.SessionManager;
import org.eclipse.sirius.diagram.DiagramPackage;
import org.eclipse.sirius.viewpoint.DAnalysis;
import org.eclipse.sirius.viewpoint.DRepresentation;
@@ -244,6 +247,38 @@ public class SiriusScope extends GMFScope {
}
/**
+ * Return a session resource of the scope, if any
+ * @return a potentially null resource
+ */
+ protected Resource getSessionResource() {
+ for (Resource candidate : getResources()) {
+ if (isSessionResource(candidate)) {
+ return candidate;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Return the Sirius session of the editing domain of the scope, if any
+ * @return a potentially null session
+ */
+ public Session getSession() {
+ Session result = null;
+ if (getEditingDomain() != null) {
+ Resource sessionResource = getSessionResource();
+ if (sessionResource != null) {
+ Session sessionForURI = SessionManager.INSTANCE.getExistingSession(
+ sessionResource.getURI());
+ if (sessionForURI != null && sessionForURI.getSessionResource() == sessionResource) {
+ result = sessionForURI;
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
* @see org.eclipse.emf.diffmerge.impl.scopes.AbstractModelScope#isContainment(org.eclipse.emf.ecore.EReference)
*/
@Override
@@ -254,6 +289,23 @@ public class SiriusScope extends GMFScope {
}
/**
+ * Return whether the given resource is a session resource
+ * @param resource_p a non-null resource
+ */
+ protected boolean isSessionResource(Resource resource_p) {
+ URI uri = resource_p.getURI();
+ return uri != null && isSessionResourceURI(uri);
+ }
+
+ /**
+ * Return whether the given URI is a session resource URI
+ * @param uri_p a non-null URI
+ */
+ protected boolean isSessionResourceURI(URI uri_p) {
+ return SiriusUtil.SESSION_RESOURCE_EXTENSION.equals(uri_p.fileExtension());
+ }
+
+ /**
* Return whether the given element can be included in a Sirius resource
* @param element_p a non-null element
*/
@@ -319,4 +371,20 @@ public class SiriusScope extends GMFScope {
return result;
}
+ /**
+ * @see org.eclipse.emf.diffmerge.impl.scopes.FragmentedModelScope#save()
+ */
+ @Override
+ public boolean save() throws Exception {
+ boolean result;
+ Session session = getSession();
+ if (session != null) {
+ session.save(new NullProgressMonitor());
+ result = true;
+ } else {
+ result = super.save();
+ }
+ return result;
+ }
+
}
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF
index 231d1bdb..4c995630 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/.project b/plugins/org.eclipse.emf.diffmerge.ui.gmf/.project
index 159fe753..3295a4ac 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/.project
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.ui.gmf</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.ui.gmf</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.ui.gmf/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
index 409b7063..f5e6a56f 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.ui.gmf;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.ui.gmf.GMFDiffMergeUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF
index cff037a4..5a24dca6 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.ui.sirius;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.ui.sirius.SiriusDiffMergeUIPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.emf.diffmerge.sirius;visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/.project b/plugins/org.eclipse.emf.diffmerge.ui/.project
index a90e01bb..297018d6 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/.project
+++ b/plugins/org.eclipse.emf.diffmerge.ui/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.ui</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge.ui/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF
index ab42c605..1f3a3bf8 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.ui;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.ui.EMFDiffMergeUIPlugin
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java
index 64c402f3..a1904ec1 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/setup/ComparisonSetupManager.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -245,12 +246,19 @@ public class ComparisonSetupManager {
*/
public List<IModelScopeDefinitionFactory> getApplicableModelScopeFactories(
Object entrypoint_p) {
- List<IModelScopeDefinitionFactory> result = new ArrayList<IModelScopeDefinitionFactory>();
+ LinkedList<IModelScopeDefinitionFactory> expandedResult =
+ new LinkedList<IModelScopeDefinitionFactory>();
for (IModelScopeDefinitionFactory factory : getRegisteredModelScopeDefinitionFactories()) {
- if (factory.isApplicableTo(entrypoint_p))
- result.add(factory);
+ if (factory.isApplicableTo(entrypoint_p)) {
+ if (factory instanceof IModelScopeDefinitionFactory.Delegating) {
+ // Delegating factories have priority
+ expandedResult.addFirst(factory);
+ } else {
+ expandedResult.addLast(factory);
+ }
+ }
}
- result = reduceByOverride(result, _scopeFactories);
+ List<IModelScopeDefinitionFactory> result = reduceByOverride(expandedResult, _scopeFactories);
return Collections.unmodifiableList(result);
}
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java
index c6b96041..4d6daabe 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/specification/IModelScopeDefinitionFactory.java
@@ -35,4 +35,12 @@ public interface IModelScopeDefinitionFactory extends IOverridableFactory {
*/
boolean isApplicableTo(Object entrypoint_p);
+
+ /**
+ * A factory that delegates to others and should therefore have priority over them.
+ */
+ interface Delegating extends IModelScopeDefinitionFactory {
+ // Nothing added
+ }
+
}
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
index 83d7f4ec..f907fea1 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/CategoryManager.java
@@ -220,8 +220,7 @@ public class CategoryManager {
IComparison comparison = match_p.getMapping().getComparison();
List<IMatch> candidates = comparison.getContentsOf(match_p);
for (IMatch candidate : candidates) {
- if (isMove(candidate, false) &&
- comparison.getContainerOf(candidate, _node.getDrivingRole().opposite()) == match_p)
+ if (isMoveOrigin(candidate))
continue; // Move origin
if (getDifferenceNumber(candidate) > 0)
result.add(candidate);
@@ -696,6 +695,34 @@ public class CategoryManager {
}
/**
+ * Return whether the given match represents a moved element on the side of the
+ * source of the move in the driving role
+ * @param match_p a non-null match
+ */
+ public boolean isMoveOrigin(IMatch match_p) {
+ IComparison comparison = match_p.getMapping().getComparison();
+ IMatch parent = comparison.getContainerOf(match_p, _node.getDrivingRole());
+ return isMoveOrigin(parent, match_p);
+ }
+
+ /**
+ * Return whether the given (parent, child) couple represents a moved element on the side of
+ * the source of the move, where source corresponds to the opposite of the driving role
+ * @param parent_p a potentially null match
+ * @param child_p a non-null match
+ */
+ public boolean isMoveOrigin(IMatch parent_p, IMatch child_p) {
+ boolean result = false;
+ if (isMove(child_p, false)) {
+ IComparison comparison = child_p.getMapping().getComparison();
+ Role drivingRole = _node.getDrivingRole();
+ result = comparison.getContainerOf(child_p, drivingRole.opposite()) == parent_p &&
+ comparison.getContainerOf(child_p, drivingRole) != parent_p;
+ }
+ return result;
+ }
+
+ /**
* Return whether the given path represents a moved element on the side of
* the source of the move, where source corresponds to the opposite of the driving role
* @param path_p a non-null path
@@ -703,14 +730,11 @@ public class CategoryManager {
public boolean isMoveOrigin(TreePath path_p) {
boolean result = false;
IMatch end = (IMatch)path_p.getLastSegment();
- if (end != null && isMove(end, false)) {
+ if (end != null) {
TreePath parentPath = path_p.getParentPath();
IMatch father =
parentPath == null? null: (IMatch)parentPath.getLastSegment();
- IComparison comparison = end.getMapping().getComparison();
- Role drivingRole = _node.getDrivingRole();
- result = comparison.getContainerOf(end, drivingRole.opposite()) == father &&
- comparison.getContainerOf(end, drivingRole) != father;
+ result = isMoveOrigin(father, end);
}
return result;
}
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java
index 54b38fd0..4b015b6e 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java
+++ b/plugins/org.eclipse.emf.diffmerge.ui/src/org/eclipse/emf/diffmerge/ui/viewers/categories/UnmatchedElementCategory.java
@@ -11,9 +11,12 @@
**********************************************************************/
package org.eclipse.emf.diffmerge.ui.viewers.categories;
+import org.eclipse.emf.diffmerge.api.IComparison;
import org.eclipse.emf.diffmerge.api.Role;
import org.eclipse.emf.diffmerge.api.diff.IDifference;
import org.eclipse.emf.diffmerge.api.diff.IElementPresence;
+import org.eclipse.emf.diffmerge.api.diff.IPresenceDifference;
+import org.eclipse.emf.diffmerge.api.diff.IReferenceValuePresence;
import org.eclipse.emf.diffmerge.ui.EMFDiffMergeUIPlugin.ImageID;
import org.eclipse.emf.diffmerge.ui.Messages;
import org.eclipse.emf.diffmerge.ui.viewers.EMFDiffNode;
@@ -46,11 +49,19 @@ public class UnmatchedElementCategory extends AbstractSideRelatedDifferenceCateg
*/
public boolean covers(IDifference difference_p, EMFDiffNode node_p) {
boolean result = false;
- if (difference_p instanceof IElementPresence) {
- IElementPresence presence = (IElementPresence)difference_p;
- Role sideRole = node_p.getRoleForSide(isLeftSide());
- result = presence.getPresenceRole() == sideRole;
- }
+ Role sideRole = node_p.getRoleForSide(isLeftSide());
+ IComparison comparison = node_p.getActualComparison();
+ result =
+ // Presence on the concerned side and ...
+ difference_p instanceof IPresenceDifference &&
+ ((IPresenceDifference)difference_p).getPresenceRole() == sideRole &&
+ // ... element presence ...
+ (difference_p instanceof IElementPresence ||
+ // ... or containment RVP and bind presence to ownership
+ difference_p instanceof IReferenceValuePresence &&
+ ((IReferenceValuePresence)difference_p).isContainment() &&
+ comparison.getLastMergePolicy().bindPresenceToOwnership(
+ comparison.getScope(sideRole)));
return result;
}
diff --git a/plugins/org.eclipse.emf.diffmerge/.project b/plugins/org.eclipse.emf.diffmerge/.project
index 8119a59f..0932d8d0 100644
--- a/plugins/org.eclipse.emf.diffmerge/.project
+++ b/plugins/org.eclipse.emf.diffmerge/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.emf.diffmerge/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.emf.diffmerge/.settings/org.eclipse.jdt.ui.prefs
index 7b1df370..5c8368b8 100644
--- a/plugins/org.eclipse.emf.diffmerge/.settings/org.eclipse.jdt.ui.prefs
+++ b/plugins/org.eclipse.emf.diffmerge/.settings/org.eclipse.jdt.ui.prefs
@@ -1,9 +1,9 @@
-eclipse.preferences.version=1
-formatter_profile=_EDMFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+eclipse.preferences.version=1
+formatter_profile=_EDMFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=e
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="true" 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 * \r\n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\r\n * \r\n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
diff --git a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
index 409722d7..dc5a43eb 100644
--- a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.emf.diffmerge.EMFDiffMergePlugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9bc4728f..7970c01d 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<build>
diff --git a/pom.xml b/pom.xml
index 0a6c422d..a89f81b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.emf.diffmerge.configuration</relativePath>
</parent>
<modules>
@@ -26,5 +26,5 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-<version>0.11.0-SNAPSHOT</version>
+<version>0.11.2-SNAPSHOT</version>
</project>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index ac346963..011abbc6 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -31,7 +31,7 @@
<artifact>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.target</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</artifact>
</target>
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
index a1b11067..a15365fe 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Javadoc for Diff/Merge Core (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.core.javadoc
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Automatic-Module-Name: org.eclipse.emf.diffmerge.core.javadoc
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
index f448200b..2c3cb627 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.emf.diffmerge.target/pom.xml b/releng/org.eclipse.emf.diffmerge.target/pom.xml
index bbe0cf5f..e9b5c097 100644
--- a/releng/org.eclipse.emf.diffmerge.target/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.target/pom.xml
@@ -6,6 +6,6 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
index c34eaf43..ff02db4d 100644
--- a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
@@ -27,7 +27,7 @@
</plugins>
<features>
- <feature id="org.eclipse.emf.diffmerge.feature" version="0.11.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.feature" version="0.11.2.qualifier"/>
<feature id="org.eclipse.emf"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.jdt"/>
@@ -62,7 +62,7 @@
<feature id="org.eclipse.emf.databinding"/>
<feature id="org.eclipse.emf.ecore.edit"/>
<feature id="org.eclipse.e4.rcp"/>
- <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.11.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.11.2.qualifier"/>
<feature id="org.eclipse.emf.workspace"/>
<feature id="org.eclipse.emf.transaction"/>
<feature id="org.eclipse.emf.validation"/>
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml b/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
index 2dd168f6..bba89cf9 100644
--- a/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.emf.diffmerge.update/category.xml b/releng/org.eclipse.emf.diffmerge.update/category.xml
index c901ce71..6795210e 100644
--- a/releng/org.eclipse.emf.diffmerge.update/category.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/category.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.11.2.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.11.2.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.11.2.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.11.2.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.11.2.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>
diff --git a/releng/org.eclipse.emf.diffmerge.update/pom.xml b/releng/org.eclipse.emf.diffmerge.update/pom.xml
index be53dc18..8d7f1422 100644
--- a/releng/org.eclipse.emf.diffmerge.update/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/pom.xml
@@ -6,6 +6,6 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index b185f525..02010c7a 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<modules>
diff --git a/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF
index 098ee3df..8f7aa60d 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.design;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF
index 1b4ae98c..cbbc07a3 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model.edit;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.structures.model.egraphs.provider.EGraphsEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF
index ddd94187..dbc4223e 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model.editor;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.structures.model.egraphs.presentation.EGraphsEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
index 2f26cfa0..025291c7 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model;singleton:=true
-Bundle-Version: 0.11.0.qualifier
+Bundle-Version: 0.11.2.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.emf.diffmerge.tests.customization/.classpath b/tests/org.eclipse.emf.diffmerge.tests.customization/.classpath
index 8a8f1668..ad32c83a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.customization/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.tests.customization/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.customization/.project b/tests/org.eclipse.emf.diffmerge.tests.customization/.project
index defe48ef..48197032 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.customization/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.customization/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.customization</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.customization</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.customization/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.tests.customization/.settings/org.eclipse.jdt.core.prefs
index f287d53c..c537b630 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.customization/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.tests.customization/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.classpath b/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.classpath
index ed2bc128..121e527a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.project b/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.project
index 6a9ac590..1e1c3e2c 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.elements.edit</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.elements.edit</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.settings/org.eclipse.jdt.core.prefs
index 560583f6..c7ef14ef 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,89 +1,89 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-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.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+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=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+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.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.classpath b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.classpath
index ed2bc128..121e527a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.project b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.project
index 1ae91477..8dbbfe3a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.elements.editor</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.elements.editor</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.settings/org.eclipse.jdt.core.prefs
index 93cd6ef3..bbedda41 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/.settings/org.eclipse.jdt.core.prefs
@@ -1,90 +1,90 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-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.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+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=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+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.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsActionBarContributor.java b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsActionBarContributor.java
index 9735166b..11dc366d 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsActionBarContributor.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsActionBarContributor.java
@@ -1,423 +1,423 @@
-/**
- */
-package org.eclipse.emf.diffmerge.tests.elements.Elements.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the Elements model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ElementsActionBarContributor
- extends EditingDomainActionBarContributor
- implements ISelectionChangedListener {
- /**
- * This keeps track of the active editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IEditorPart activeEditorPart;
-
- /**
- * This keeps track of the current selection provider.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ISelectionProvider selectionProvider;
-
- /**
- * This action opens the Properties view.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IAction showPropertiesViewAction =
- new Action(ElementsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
- @Override
- public void run() {
- try {
- getPage().showView("org.eclipse.ui.views.PropertySheet");
- }
- catch (PartInitException exception) {
- ElementsEditorPlugin.INSTANCE.log(exception);
- }
- }
- };
-
- /**
- * This action refreshes the viewer of the current editor if the editor
- * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IAction refreshViewerAction =
- new Action(ElementsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
- @Override
- public boolean isEnabled() {
- return activeEditorPart instanceof IViewerProvider;
- }
-
- @Override
- public void run() {
- if (activeEditorPart instanceof IViewerProvider) {
- Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
- if (viewer != null) {
- viewer.refresh();
- }
- }
- }
- };
-
- /**
- * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
- * generated for the current selection by the item provider.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<IAction> createChildActions;
-
- /**
- * This is the menu manager into which menu contribution items should be added for CreateChild actions.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMenuManager createChildMenuManager;
-
- /**
- * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
- * generated for the current selection by the item provider.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<IAction> createSiblingActions;
-
- /**
- * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IMenuManager createSiblingMenuManager;
-
- /**
- * This creates an instance of the contributor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ElementsActionBarContributor() {
- super(ADDITIONS_LAST_STYLE);
- loadResourceAction = new LoadResourceAction();
- validateAction = new ValidateAction();
- controlAction = new ControlAction();
- }
-
- /**
- * This adds Separators for editor additions to the tool bar.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void contributeToToolBar(IToolBarManager toolBarManager) {
- toolBarManager.add(new Separator("elements-settings"));
- toolBarManager.add(new Separator("elements-additions"));
- }
-
- /**
- * This adds to the menu bar a menu and some separators for editor additions,
- * as well as the sub-menus for object creation items.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void contributeToMenu(IMenuManager menuManager) {
- super.contributeToMenu(menuManager);
-
- IMenuManager submenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditor_menu"), "org.eclipse.emf.diffmerge.tests.elements.ElementsMenuID");
- menuManager.insertAfter("additions", submenuManager);
- submenuManager.add(new Separator("settings"));
- submenuManager.add(new Separator("actions"));
- submenuManager.add(new Separator("additions"));
- submenuManager.add(new Separator("additions-end"));
-
- // Prepare for CreateChild item addition or removal.
- //
- createChildMenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
- submenuManager.insertBefore("additions", createChildMenuManager);
-
- // Prepare for CreateSibling item addition or removal.
- //
- createSiblingMenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
- submenuManager.insertBefore("additions", createSiblingMenuManager);
-
- // Force an update because Eclipse hides empty menus now.
- //
- submenuManager.addMenuListener
- (new IMenuListener() {
- public void menuAboutToShow(IMenuManager menuManager) {
- menuManager.updateAll(true);
- }
- });
-
- addGlobalActions(submenuManager);
- }
-
- /**
- * When the active editor changes, this remembers the change and registers with it as a selection provider.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void setActiveEditor(IEditorPart part) {
- super.setActiveEditor(part);
- activeEditorPart = part;
-
- // Switch to the new selection provider.
- //
- if (selectionProvider != null) {
- selectionProvider.removeSelectionChangedListener(this);
- }
- if (part == null) {
- selectionProvider = null;
- }
- else {
- selectionProvider = part.getSite().getSelectionProvider();
- selectionProvider.addSelectionChangedListener(this);
-
- // Fake a selection changed event to update the menus.
- //
- if (selectionProvider.getSelection() != null) {
- selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
- }
- }
- }
-
- /**
- * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
- * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
- * that can be added to the selected object and updating the menus accordingly.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void selectionChanged(SelectionChangedEvent event) {
- // Remove any menu items for old selection.
- //
- if (createChildMenuManager != null) {
- depopulateManager(createChildMenuManager, createChildActions);
- }
- if (createSiblingMenuManager != null) {
- depopulateManager(createSiblingMenuManager, createSiblingActions);
- }
-
- // Query the new selection for appropriate new child/sibling descriptors
- //
- Collection<?> newChildDescriptors = null;
- Collection<?> newSiblingDescriptors = null;
-
- ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
- Object object = ((IStructuredSelection)selection).getFirstElement();
-
- EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
-
- newChildDescriptors = domain.getNewChildDescriptors(object, null);
- newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
- }
-
- // Generate actions for selection; populate and redraw the menus.
- //
- createChildActions = generateCreateChildActions(newChildDescriptors, selection);
- createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
- if (createChildMenuManager != null) {
- populateManager(createChildMenuManager, createChildActions, null);
- createChildMenuManager.update(true);
- }
- if (createSiblingMenuManager != null) {
- populateManager(createSiblingMenuManager, createSiblingActions, null);
- createSiblingMenuManager.update(true);
- }
- }
-
- /**
- * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
- * and returns the collection of these actions.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
- Collection<IAction> actions = new ArrayList<IAction>();
- if (descriptors != null) {
- for (Object descriptor : descriptors) {
- actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
- }
- }
- return actions;
- }
-
- /**
- * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
- * and returns the collection of these actions.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
- Collection<IAction> actions = new ArrayList<IAction>();
- if (descriptors != null) {
- for (Object descriptor : descriptors) {
- actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
- }
- }
- return actions;
- }
-
- /**
- * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
- * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
- * by inserting them before the specified contribution item <code>contributionID</code>.
- * If <code>contributionID</code> is <code>null</code>, they are simply added.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
- if (actions != null) {
- for (IAction action : actions) {
- if (contributionID != null) {
- manager.insertBefore(contributionID, action);
- }
- else {
- manager.add(action);
- }
- }
- }
- }
-
- /**
- * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
- * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
- if (actions != null) {
- IContributionItem[] items = manager.getItems();
- for (int i = 0; i < items.length; i++) {
- // Look into SubContributionItems
- //
- IContributionItem contributionItem = items[i];
- while (contributionItem instanceof SubContributionItem) {
- contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
- }
-
- // Delete the ActionContributionItems with matching action.
- //
- if (contributionItem instanceof ActionContributionItem) {
- IAction action = ((ActionContributionItem)contributionItem).getAction();
- if (actions.contains(action)) {
- manager.remove(contributionItem);
- }
- }
- }
- }
- }
-
- /**
- * This populates the pop-up menu before it appears.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void menuAboutToShow(IMenuManager menuManager) {
- super.menuAboutToShow(menuManager);
- MenuManager submenuManager = null;
-
- submenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
- populateManager(submenuManager, createChildActions, null);
- menuManager.insertBefore("edit", submenuManager);
-
- submenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
- populateManager(submenuManager, createSiblingActions, null);
- menuManager.insertBefore("edit", submenuManager);
- }
-
- /**
- * This inserts global actions before the "additions-end" separator.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected void addGlobalActions(IMenuManager menuManager) {
- menuManager.insertAfter("additions-end", new Separator("ui-actions"));
- menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
- refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
- menuManager.insertAfter("ui-actions", refreshViewerAction);
-
- super.addGlobalActions(menuManager);
- }
-
- /**
- * This ensures that a delete action will clean up all references to deleted objects.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected boolean removeAllReferencesOnDelete() {
- return true;
- }
-
-}
+/**
+ */
+package org.eclipse.emf.diffmerge.tests.elements.Elements.presentation;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.eclipse.emf.common.ui.viewer.IViewerProvider;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+import org.eclipse.emf.edit.ui.action.ControlAction;
+import org.eclipse.emf.edit.ui.action.CreateChildAction;
+import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
+import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
+import org.eclipse.emf.edit.ui.action.LoadResourceAction;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.jface.action.IContributionManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.SubContributionItem;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.PartInitException;
+
+/**
+ * This is the action bar contributor for the Elements model editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ElementsActionBarContributor
+ extends EditingDomainActionBarContributor
+ implements ISelectionChangedListener {
+ /**
+ * This keeps track of the active editor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IEditorPart activeEditorPart;
+
+ /**
+ * This keeps track of the current selection provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ISelectionProvider selectionProvider;
+
+ /**
+ * This action opens the Properties view.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IAction showPropertiesViewAction =
+ new Action(ElementsEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
+ @Override
+ public void run() {
+ try {
+ getPage().showView("org.eclipse.ui.views.PropertySheet");
+ }
+ catch (PartInitException exception) {
+ ElementsEditorPlugin.INSTANCE.log(exception);
+ }
+ }
+ };
+
+ /**
+ * This action refreshes the viewer of the current editor if the editor
+ * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IAction refreshViewerAction =
+ new Action(ElementsEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+ @Override
+ public boolean isEnabled() {
+ return activeEditorPart instanceof IViewerProvider;
+ }
+
+ @Override
+ public void run() {
+ if (activeEditorPart instanceof IViewerProvider) {
+ Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
+ if (viewer != null) {
+ viewer.refresh();
+ }
+ }
+ }
+ };
+
+ /**
+ * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
+ * generated for the current selection by the item provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> createChildActions;
+
+ /**
+ * This is the menu manager into which menu contribution items should be added for CreateChild actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IMenuManager createChildMenuManager;
+
+ /**
+ * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
+ * generated for the current selection by the item provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> createSiblingActions;
+
+ /**
+ * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IMenuManager createSiblingMenuManager;
+
+ /**
+ * This creates an instance of the contributor.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ElementsActionBarContributor() {
+ super(ADDITIONS_LAST_STYLE);
+ loadResourceAction = new LoadResourceAction();
+ validateAction = new ValidateAction();
+ controlAction = new ControlAction();
+ }
+
+ /**
+ * This adds Separators for editor additions to the tool bar.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void contributeToToolBar(IToolBarManager toolBarManager) {
+ toolBarManager.add(new Separator("elements-settings"));
+ toolBarManager.add(new Separator("elements-additions"));
+ }
+
+ /**
+ * This adds to the menu bar a menu and some separators for editor additions,
+ * as well as the sub-menus for object creation items.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void contributeToMenu(IMenuManager menuManager) {
+ super.contributeToMenu(menuManager);
+
+ IMenuManager submenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditor_menu"), "org.eclipse.emf.diffmerge.tests.elements.ElementsMenuID");
+ menuManager.insertAfter("additions", submenuManager);
+ submenuManager.add(new Separator("settings"));
+ submenuManager.add(new Separator("actions"));
+ submenuManager.add(new Separator("additions"));
+ submenuManager.add(new Separator("additions-end"));
+
+ // Prepare for CreateChild item addition or removal.
+ //
+ createChildMenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ submenuManager.insertBefore("additions", createChildMenuManager);
+
+ // Prepare for CreateSibling item addition or removal.
+ //
+ createSiblingMenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ submenuManager.insertBefore("additions", createSiblingMenuManager);
+
+ // Force an update because Eclipse hides empty menus now.
+ //
+ submenuManager.addMenuListener
+ (new IMenuListener() {
+ public void menuAboutToShow(IMenuManager menuManager) {
+ menuManager.updateAll(true);
+ }
+ });
+
+ addGlobalActions(submenuManager);
+ }
+
+ /**
+ * When the active editor changes, this remembers the change and registers with it as a selection provider.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setActiveEditor(IEditorPart part) {
+ super.setActiveEditor(part);
+ activeEditorPart = part;
+
+ // Switch to the new selection provider.
+ //
+ if (selectionProvider != null) {
+ selectionProvider.removeSelectionChangedListener(this);
+ }
+ if (part == null) {
+ selectionProvider = null;
+ }
+ else {
+ selectionProvider = part.getSite().getSelectionProvider();
+ selectionProvider.addSelectionChangedListener(this);
+
+ // Fake a selection changed event to update the menus.
+ //
+ if (selectionProvider.getSelection() != null) {
+ selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+ }
+ }
+ }
+
+ /**
+ * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
+ * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
+ * that can be added to the selected object and updating the menus accordingly.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void selectionChanged(SelectionChangedEvent event) {
+ // Remove any menu items for old selection.
+ //
+ if (createChildMenuManager != null) {
+ depopulateManager(createChildMenuManager, createChildActions);
+ }
+ if (createSiblingMenuManager != null) {
+ depopulateManager(createSiblingMenuManager, createSiblingActions);
+ }
+
+ // Query the new selection for appropriate new child/sibling descriptors
+ //
+ Collection<?> newChildDescriptors = null;
+ Collection<?> newSiblingDescriptors = null;
+
+ ISelection selection = event.getSelection();
+ if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+
+ EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+
+ newChildDescriptors = domain.getNewChildDescriptors(object, null);
+ newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
+ }
+
+ // Generate actions for selection; populate and redraw the menus.
+ //
+ createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+ createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+
+ if (createChildMenuManager != null) {
+ populateManager(createChildMenuManager, createChildActions, null);
+ createChildMenuManager.update(true);
+ }
+ if (createSiblingMenuManager != null) {
+ populateManager(createSiblingMenuManager, createSiblingActions, null);
+ createSiblingMenuManager.update(true);
+ }
+ }
+
+ /**
+ * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
+ * and returns the collection of these actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+ Collection<IAction> actions = new ArrayList<IAction>();
+ if (descriptors != null) {
+ for (Object descriptor : descriptors) {
+ actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+ }
+ }
+ return actions;
+ }
+
+ /**
+ * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
+ * and returns the collection of these actions.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+ Collection<IAction> actions = new ArrayList<IAction>();
+ if (descriptors != null) {
+ for (Object descriptor : descriptors) {
+ actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+ }
+ }
+ return actions;
+ }
+
+ /**
+ * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
+ * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
+ * by inserting them before the specified contribution item <code>contributionID</code>.
+ * If <code>contributionID</code> is <code>null</code>, they are simply added.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+ if (actions != null) {
+ for (IAction action : actions) {
+ if (contributionID != null) {
+ manager.insertBefore(contributionID, action);
+ }
+ else {
+ manager.add(action);
+ }
+ }
+ }
+ }
+
+ /**
+ * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
+ * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+ if (actions != null) {
+ IContributionItem[] items = manager.getItems();
+ for (int i = 0; i < items.length; i++) {
+ // Look into SubContributionItems
+ //
+ IContributionItem contributionItem = items[i];
+ while (contributionItem instanceof SubContributionItem) {
+ contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+ }
+
+ // Delete the ActionContributionItems with matching action.
+ //
+ if (contributionItem instanceof ActionContributionItem) {
+ IAction action = ((ActionContributionItem)contributionItem).getAction();
+ if (actions.contains(action)) {
+ manager.remove(contributionItem);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This populates the pop-up menu before it appears.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void menuAboutToShow(IMenuManager menuManager) {
+ super.menuAboutToShow(menuManager);
+ MenuManager submenuManager = null;
+
+ submenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+ populateManager(submenuManager, createChildActions, null);
+ menuManager.insertBefore("edit", submenuManager);
+
+ submenuManager = new MenuManager(ElementsEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+ populateManager(submenuManager, createSiblingActions, null);
+ menuManager.insertBefore("edit", submenuManager);
+ }
+
+ /**
+ * This inserts global actions before the "additions-end" separator.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void addGlobalActions(IMenuManager menuManager) {
+ menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+ menuManager.insertAfter("ui-actions", showPropertiesViewAction);
+
+ refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+ menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+ super.addGlobalActions(menuManager);
+ }
+
+ /**
+ * This ensures that a delete action will clean up all references to deleted objects.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean removeAllReferencesOnDelete() {
+ return true;
+ }
+
+}
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsEditorPlugin.java b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsEditorPlugin.java
index 562ce72a..8580cec5 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsEditorPlugin.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsEditorPlugin.java
@@ -1,91 +1,91 @@
-/**
- */
-package org.eclipse.emf.diffmerge.tests.elements.Elements.presentation;
-
-import org.eclipse.emf.common.EMFPlugin;
-
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the Elements editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class ElementsEditorPlugin extends EMFPlugin {
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final ElementsEditorPlugin INSTANCE = new ElementsEditorPlugin();
-
- /**
- * Keep track of the singleton.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private static Implementation plugin;
-
- /**
- * Create the instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ElementsEditorPlugin() {
- super
- (new ResourceLocator [] {
- });
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- @Override
- public ResourceLocator getPluginResourceLocator() {
- return plugin;
- }
-
- /**
- * Returns the singleton instance of the Eclipse plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the singleton instance.
- * @generated
- */
- public static Implementation getPlugin() {
- return plugin;
- }
-
- /**
- * The actual implementation of the Eclipse <b>Plugin</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static class Implementation extends EclipseUIPlugin {
- /**
- * Creates an instance.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public Implementation() {
- super();
-
- // Remember the static instance.
- //
- plugin = this;
- }
- }
-
-}
+/**
+ */
+package org.eclipse.emf.diffmerge.tests.elements.Elements.presentation;
+
+import org.eclipse.emf.common.EMFPlugin;
+
+import org.eclipse.emf.common.ui.EclipseUIPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * This is the central singleton for the Elements editor plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public final class ElementsEditorPlugin extends EMFPlugin {
+ /**
+ * Keep track of the singleton.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final ElementsEditorPlugin INSTANCE = new ElementsEditorPlugin();
+
+ /**
+ * Keep track of the singleton.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ private static Implementation plugin;
+
+ /**
+ * Create the instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ElementsEditorPlugin() {
+ super
+ (new ResourceLocator [] {
+ });
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the singleton instance.
+ * @generated
+ */
+ @Override
+ public ResourceLocator getPluginResourceLocator() {
+ return plugin;
+ }
+
+ /**
+ * Returns the singleton instance of the Eclipse plugin.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the singleton instance.
+ * @generated
+ */
+ public static Implementation getPlugin() {
+ return plugin;
+ }
+
+ /**
+ * The actual implementation of the Eclipse <b>Plugin</b>.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static class Implementation extends EclipseUIPlugin {
+ /**
+ * Creates an instance.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Implementation() {
+ super();
+
+ // Remember the static instance.
+ //
+ plugin = this;
+ }
+ }
+
+}
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsModelWizard.java b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsModelWizard.java
index a9b5b6c8..4b2dac3a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsModelWizard.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements.editor/src/org/eclipse/emf/diffmerge/tests/elements/Elements/presentation/ElementsModelWizard.java
@@ -1,627 +1,627 @@
-/**
- */
-package org.eclipse.emf.diffmerge.tests.elements.Elements.presentation;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.MissingResourceException;
-import java.util.StringTokenizer;
-
-import org.eclipse.emf.common.CommonPlugin;
-
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-
-import org.eclipse.swt.SWT;
-
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.ModifyEvent;
-
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-import org.eclipse.emf.diffmerge.tests.elements.Elements.ElementsFactory;
-import org.eclipse.emf.diffmerge.tests.elements.Elements.ElementsPackage;
-import org.eclipse.emf.diffmerge.tests.elements.Elements.provider.ElementsEditPlugin;
-
-
-import org.eclipse.core.runtime.Path;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ElementsModelWizard extends Wizard implements INewWizard {
- /**
- * The supported extensions for created files.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final List<String> FILE_EXTENSIONS =
- Collections.unmodifiableList(Arrays.asList(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameExtensions").split("\\s*,\\s*")));
-
- /**
- * A formatted list of supported file extensions, suitable for display.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static final String FORMATTED_FILE_EXTENSIONS =
- ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
-
- /**
- * This caches an instance of the model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ElementsPackage elementsPackage = ElementsPackage.eINSTANCE;
-
- /**
- * This caches an instance of the model factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ElementsFactory elementsFactory = elementsPackage.getElementsFactory();
-
- /**
- * This is the file creation page.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ElementsModelWizardNewFileCreationPage newFileCreationPage;
-
- /**
- * This is the initial object creation page.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ElementsModelWizardInitialObjectCreationPage initialObjectCreationPage;
-
- /**
- * Remember the selection during initialization for populating the default container.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IStructuredSelection selection;
-
- /**
- * Remember the workbench during initialization.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IWorkbench workbench;
-
- /**
- * Caches the names of the types that can be created as the root object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected List<String> initialObjectNames;
-
- /**
- * This just records the information.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void init(IWorkbench workbench, IStructuredSelection selection) {
- this.workbench = workbench;
- this.selection = selection;
- setWindowTitle(ElementsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
- setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ElementsEditorPlugin.INSTANCE.getImage("full/wizban/NewElements")));
- }
-
- /**
- * Returns the names of the types that can be created as the root object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<String> getInitialObjectNames() {
- if (initialObjectNames == null) {
- initialObjectNames = new ArrayList<String>();
- for (EClassifier eClassifier : elementsPackage.getEClassifiers()) {
- if (eClassifier instanceof EClass) {
- EClass eClass = (EClass)eClassifier;
- if (!eClass.isAbstract()) {
- initialObjectNames.add(eClass.getName());
- }
- }
- }
- Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
- }
- return initialObjectNames;
- }
-
- /**
- * Create a new model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EObject createInitialModel() {
- EClass eClass = (EClass)elementsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
- EObject rootObject = elementsFactory.create(eClass);
- return rootObject;
- }
-
- /**
- * Do the work after everything is specified.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean performFinish() {
- try {
- // Remember the file.
- //
- final IFile modelFile = getModelFile();
-
- // Do the work within an operation.
- //
- WorkspaceModifyOperation operation =
- new WorkspaceModifyOperation() {
- @Override
- protected void execute(IProgressMonitor progressMonitor) {
- try {
- // Create a resource set
- //
- ResourceSet resourceSet = new ResourceSetImpl();
-
- // Get the URI of the model file.
- //
- URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
- // Create a resource for this file.
- //
- Resource resource = resourceSet.createResource(fileURI);
-
- // Add the initial model object to the contents.
- //
- EObject rootObject = createInitialModel();
- if (rootObject != null) {
- resource.getContents().add(rootObject);
- }
-
- // Save the contents of the resource to the file system.
- //
- Map<Object, Object> options = new HashMap<Object, Object>();
- options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
- resource.save(options);
- }
- catch (Exception exception) {
- ElementsEditorPlugin.INSTANCE.log(exception);
- }
- finally {
- progressMonitor.done();
- }
- }
- };
-
- getContainer().run(false, false, operation);
-
- // Select the new file resource in the current view.
- //
- IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
- IWorkbenchPage page = workbenchWindow.getActivePage();
- final IWorkbenchPart activePart = page.getActivePart();
- if (activePart instanceof ISetSelectionTarget) {
- final ISelection targetSelection = new StructuredSelection(modelFile);
- getShell().getDisplay().asyncExec
- (new Runnable() {
- public void run() {
- ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
- }
- });
- }
-
- // Open an editor on the new file.
- //
- try {
- page.openEditor
- (new FileEditorInput(modelFile),
- workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
- }
- catch (PartInitException exception) {
- MessageDialog.openError(workbenchWindow.getShell(), ElementsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
- return false;
- }
-
- return true;
- }
- catch (Exception exception) {
- ElementsEditorPlugin.INSTANCE.log(exception);
- return false;
- }
- }
-
- /**
- * This is the one page of the wizard.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public class ElementsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
- /**
- * Pass in the selection.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ElementsModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
- super(pageId, selection);
- }
-
- /**
- * The framework calls this to see if the file is correct.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected boolean validatePage() {
- if (super.validatePage()) {
- String extension = new Path(getFileName()).getFileExtension();
- if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
- String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
- setErrorMessage(ElementsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
- return false;
- }
- return true;
- }
- return false;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IFile getModelFile() {
- return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
- }
- }
-
- /**
- * This is the page where the type of object to create is selected.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public class ElementsModelWizardInitialObjectCreationPage extends WizardPage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Combo initialObjectField;
-
- /**
- * @generated
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- */
- protected List<String> encodings;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Combo encodingField;
-
- /**
- * Pass in the selection.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ElementsModelWizardInitialObjectCreationPage(String pageId) {
- super(pageId);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void createControl(Composite parent) {
- Composite composite = new Composite(parent, SWT.NONE); {
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- layout.verticalSpacing = 12;
- composite.setLayout(layout);
-
- GridData data = new GridData();
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- data.horizontalAlignment = GridData.FILL;
- composite.setLayoutData(data);
- }
-
- Label containerLabel = new Label(composite, SWT.LEFT);
- {
- containerLabel.setText(ElementsEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- containerLabel.setLayoutData(data);
- }
-
- initialObjectField = new Combo(composite, SWT.BORDER);
- {
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- initialObjectField.setLayoutData(data);
- }
-
- for (String objectName : getInitialObjectNames()) {
- initialObjectField.add(getLabel(objectName));
- }
-
- if (initialObjectField.getItemCount() == 1) {
- initialObjectField.select(0);
- }
- initialObjectField.addModifyListener(validator);
-
- Label encodingLabel = new Label(composite, SWT.LEFT);
- {
- encodingLabel.setText(ElementsEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- encodingLabel.setLayoutData(data);
- }
- encodingField = new Combo(composite, SWT.BORDER);
- {
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- encodingField.setLayoutData(data);
- }
-
- for (String encoding : getEncodings()) {
- encodingField.add(encoding);
- }
-
- encodingField.select(0);
- encodingField.addModifyListener(validator);
-
- setPageComplete(validatePage());
- setControl(composite);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ModifyListener validator =
- new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- setPageComplete(validatePage());
- }
- };
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected boolean validatePage() {
- return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void setVisible(boolean visible) {
- super.setVisible(visible);
- if (visible) {
- if (initialObjectField.getItemCount() == 1) {
- initialObjectField.clearSelection();
- encodingField.setFocus();
- }
- else {
- encodingField.clearSelection();
- initialObjectField.setFocus();
- }
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getInitialObjectName() {
- String label = initialObjectField.getText();
-
- for (String name : getInitialObjectNames()) {
- if (getLabel(name).equals(label)) {
- return name;
- }
- }
- return null;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getEncoding() {
- return encodingField.getText();
- }
-
- /**
- * Returns the label for the specified type name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected String getLabel(String typeName) {
- try {
- return ElementsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
- }
- catch(MissingResourceException mre) {
- ElementsEditorPlugin.INSTANCE.log(mre);
- }
- return typeName;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Collection<String> getEncodings() {
- if (encodings == null) {
- encodings = new ArrayList<String>();
- for (StringTokenizer stringTokenizer = new StringTokenizer(ElementsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
- encodings.add(stringTokenizer.nextToken());
- }
- }
- return encodings;
- }
- }
-
- /**
- * The framework calls this to create the contents of the wizard.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void addPages() {
- // Create a page, set the title, and the initial model file name.
- //
- newFileCreationPage = new ElementsModelWizardNewFileCreationPage("Whatever", selection);
- newFileCreationPage.setTitle(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsModelWizard_label"));
- newFileCreationPage.setDescription(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsModelWizard_description"));
- newFileCreationPage.setFileName(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
- addPage(newFileCreationPage);
-
- // Try and get the resource selection to determine a current directory for the file dialog.
- //
- if (selection != null && !selection.isEmpty()) {
- // Get the resource...
- //
- Object selectedElement = selection.iterator().next();
- if (selectedElement instanceof IResource) {
- // Get the resource parent, if its a file.
- //
- IResource selectedResource = (IResource)selectedElement;
- if (selectedResource.getType() == IResource.FILE) {
- selectedResource = selectedResource.getParent();
- }
-
- // This gives us a directory...
- //
- if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
- // Set this for the container.
- //
- newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-
- // Make up a unique new name here.
- //
- String defaultModelBaseFilename = ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameDefaultBase");
- String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
- String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
- for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
- modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
- }
- newFileCreationPage.setFileName(modelFilename);
- }
- }
- }
- initialObjectCreationPage = new ElementsModelWizardInitialObjectCreationPage("Whatever2");
- initialObjectCreationPage.setTitle(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsModelWizard_label"));
- initialObjectCreationPage.setDescription(ElementsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
- addPage(initialObjectCreationPage);
- }
-
- /**
- * Get the file from the page.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IFile getModelFile() {
- return newFileCreationPage.getModelFile();
- }
-
-}
+/**
+ */
+package org.eclipse.emf.diffmerge.tests.elements.Elements.presentation;
+
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.StringTokenizer;
+
+import org.eclipse.emf.common.CommonPlugin;
+
+import org.eclipse.emf.common.util.URI;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+
+import org.eclipse.emf.ecore.EObject;
+
+import org.eclipse.emf.ecore.xmi.XMLResource;
+
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+
+import org.eclipse.core.runtime.IProgressMonitor;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+
+import org.eclipse.jface.viewers.IStructuredSelection;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jface.wizard.WizardPage;
+
+import org.eclipse.swt.SWT;
+
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.ModifyEvent;
+
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+import org.eclipse.ui.INewWizard;
+import org.eclipse.ui.IWorkbench;
+
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+
+import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
+
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.part.ISetSelectionTarget;
+
+import org.eclipse.emf.diffmerge.tests.elements.Elements.ElementsFactory;
+import org.eclipse.emf.diffmerge.tests.elements.Elements.ElementsPackage;
+import org.eclipse.emf.diffmerge.tests.elements.Elements.provider.ElementsEditPlugin;
+
+
+import org.eclipse.core.runtime.Path;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+
+
+/**
+ * This is a simple wizard for creating a new model file.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class ElementsModelWizard extends Wizard implements INewWizard {
+ /**
+ * The supported extensions for created files.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final List<String> FILE_EXTENSIONS =
+ Collections.unmodifiableList(Arrays.asList(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameExtensions").split("\\s*,\\s*")));
+
+ /**
+ * A formatted list of supported file extensions, suitable for display.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final String FORMATTED_FILE_EXTENSIONS =
+ ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+
+ /**
+ * This caches an instance of the model package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ElementsPackage elementsPackage = ElementsPackage.eINSTANCE;
+
+ /**
+ * This caches an instance of the model factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ElementsFactory elementsFactory = elementsPackage.getElementsFactory();
+
+ /**
+ * This is the file creation page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ElementsModelWizardNewFileCreationPage newFileCreationPage;
+
+ /**
+ * This is the initial object creation page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ElementsModelWizardInitialObjectCreationPage initialObjectCreationPage;
+
+ /**
+ * Remember the selection during initialization for populating the default container.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IStructuredSelection selection;
+
+ /**
+ * Remember the workbench during initialization.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected IWorkbench workbench;
+
+ /**
+ * Caches the names of the types that can be created as the root object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected List<String> initialObjectNames;
+
+ /**
+ * This just records the information.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
+ this.workbench = workbench;
+ this.selection = selection;
+ setWindowTitle(ElementsEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
+ setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(ElementsEditorPlugin.INSTANCE.getImage("full/wizban/NewElements")));
+ }
+
+ /**
+ * Returns the names of the types that can be created as the root object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<String> getInitialObjectNames() {
+ if (initialObjectNames == null) {
+ initialObjectNames = new ArrayList<String>();
+ for (EClassifier eClassifier : elementsPackage.getEClassifiers()) {
+ if (eClassifier instanceof EClass) {
+ EClass eClass = (EClass)eClassifier;
+ if (!eClass.isAbstract()) {
+ initialObjectNames.add(eClass.getName());
+ }
+ }
+ }
+ Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+ }
+ return initialObjectNames;
+ }
+
+ /**
+ * Create a new model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected EObject createInitialModel() {
+ EClass eClass = (EClass)elementsPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+ EObject rootObject = elementsFactory.create(eClass);
+ return rootObject;
+ }
+
+ /**
+ * Do the work after everything is specified.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean performFinish() {
+ try {
+ // Remember the file.
+ //
+ final IFile modelFile = getModelFile();
+
+ // Do the work within an operation.
+ //
+ WorkspaceModifyOperation operation =
+ new WorkspaceModifyOperation() {
+ @Override
+ protected void execute(IProgressMonitor progressMonitor) {
+ try {
+ // Create a resource set
+ //
+ ResourceSet resourceSet = new ResourceSetImpl();
+
+ // Get the URI of the model file.
+ //
+ URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+
+ // Create a resource for this file.
+ //
+ Resource resource = resourceSet.createResource(fileURI);
+
+ // Add the initial model object to the contents.
+ //
+ EObject rootObject = createInitialModel();
+ if (rootObject != null) {
+ resource.getContents().add(rootObject);
+ }
+
+ // Save the contents of the resource to the file system.
+ //
+ Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+ resource.save(options);
+ }
+ catch (Exception exception) {
+ ElementsEditorPlugin.INSTANCE.log(exception);
+ }
+ finally {
+ progressMonitor.done();
+ }
+ }
+ };
+
+ getContainer().run(false, false, operation);
+
+ // Select the new file resource in the current view.
+ //
+ IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+ IWorkbenchPage page = workbenchWindow.getActivePage();
+ final IWorkbenchPart activePart = page.getActivePart();
+ if (activePart instanceof ISetSelectionTarget) {
+ final ISelection targetSelection = new StructuredSelection(modelFile);
+ getShell().getDisplay().asyncExec
+ (new Runnable() {
+ public void run() {
+ ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
+ }
+ });
+ }
+
+ // Open an editor on the new file.
+ //
+ try {
+ page.openEditor
+ (new FileEditorInput(modelFile),
+ workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+ }
+ catch (PartInitException exception) {
+ MessageDialog.openError(workbenchWindow.getShell(), ElementsEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+ return false;
+ }
+
+ return true;
+ }
+ catch (Exception exception) {
+ ElementsEditorPlugin.INSTANCE.log(exception);
+ return false;
+ }
+ }
+
+ /**
+ * This is the one page of the wizard.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class ElementsModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+ /**
+ * Pass in the selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ElementsModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+ super(pageId, selection);
+ }
+
+ /**
+ * The framework calls this to see if the file is correct.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean validatePage() {
+ if (super.validatePage()) {
+ String extension = new Path(getFileName()).getFileExtension();
+ if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+ String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
+ setErrorMessage(ElementsEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+ return false;
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IFile getModelFile() {
+ return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+ }
+ }
+
+ /**
+ * This is the page where the type of object to create is selected.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public class ElementsModelWizardInitialObjectCreationPage extends WizardPage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Combo initialObjectField;
+
+ /**
+ * @generated
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ */
+ protected List<String> encodings;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Combo encodingField;
+
+ /**
+ * Pass in the selection.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public ElementsModelWizardInitialObjectCreationPage(String pageId) {
+ super(pageId);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void createControl(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE); {
+ GridLayout layout = new GridLayout();
+ layout.numColumns = 1;
+ layout.verticalSpacing = 12;
+ composite.setLayout(layout);
+
+ GridData data = new GridData();
+ data.verticalAlignment = GridData.FILL;
+ data.grabExcessVerticalSpace = true;
+ data.horizontalAlignment = GridData.FILL;
+ composite.setLayoutData(data);
+ }
+
+ Label containerLabel = new Label(composite, SWT.LEFT);
+ {
+ containerLabel.setText(ElementsEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ containerLabel.setLayoutData(data);
+ }
+
+ initialObjectField = new Combo(composite, SWT.BORDER);
+ {
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ initialObjectField.setLayoutData(data);
+ }
+
+ for (String objectName : getInitialObjectNames()) {
+ initialObjectField.add(getLabel(objectName));
+ }
+
+ if (initialObjectField.getItemCount() == 1) {
+ initialObjectField.select(0);
+ }
+ initialObjectField.addModifyListener(validator);
+
+ Label encodingLabel = new Label(composite, SWT.LEFT);
+ {
+ encodingLabel.setText(ElementsEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ encodingLabel.setLayoutData(data);
+ }
+ encodingField = new Combo(composite, SWT.BORDER);
+ {
+ GridData data = new GridData();
+ data.horizontalAlignment = GridData.FILL;
+ data.grabExcessHorizontalSpace = true;
+ encodingField.setLayoutData(data);
+ }
+
+ for (String encoding : getEncodings()) {
+ encodingField.add(encoding);
+ }
+
+ encodingField.select(0);
+ encodingField.addModifyListener(validator);
+
+ setPageComplete(validatePage());
+ setControl(composite);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected ModifyListener validator =
+ new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ setPageComplete(validatePage());
+ }
+ };
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected boolean validatePage() {
+ return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void setVisible(boolean visible) {
+ super.setVisible(visible);
+ if (visible) {
+ if (initialObjectField.getItemCount() == 1) {
+ initialObjectField.clearSelection();
+ encodingField.setFocus();
+ }
+ else {
+ encodingField.clearSelection();
+ initialObjectField.setFocus();
+ }
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getInitialObjectName() {
+ String label = initialObjectField.getText();
+
+ for (String name : getInitialObjectNames()) {
+ if (getLabel(name).equals(label)) {
+ return name;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getEncoding() {
+ return encodingField.getText();
+ }
+
+ /**
+ * Returns the label for the specified type name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected String getLabel(String typeName) {
+ try {
+ return ElementsEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
+ }
+ catch(MissingResourceException mre) {
+ ElementsEditorPlugin.INSTANCE.log(mre);
+ }
+ return typeName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected Collection<String> getEncodings() {
+ if (encodings == null) {
+ encodings = new ArrayList<String>();
+ for (StringTokenizer stringTokenizer = new StringTokenizer(ElementsEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+ encodings.add(stringTokenizer.nextToken());
+ }
+ }
+ return encodings;
+ }
+ }
+
+ /**
+ * The framework calls this to create the contents of the wizard.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void addPages() {
+ // Create a page, set the title, and the initial model file name.
+ //
+ newFileCreationPage = new ElementsModelWizardNewFileCreationPage("Whatever", selection);
+ newFileCreationPage.setTitle(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsModelWizard_label"));
+ newFileCreationPage.setDescription(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsModelWizard_description"));
+ newFileCreationPage.setFileName(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+ addPage(newFileCreationPage);
+
+ // Try and get the resource selection to determine a current directory for the file dialog.
+ //
+ if (selection != null && !selection.isEmpty()) {
+ // Get the resource...
+ //
+ Object selectedElement = selection.iterator().next();
+ if (selectedElement instanceof IResource) {
+ // Get the resource parent, if its a file.
+ //
+ IResource selectedResource = (IResource)selectedElement;
+ if (selectedResource.getType() == IResource.FILE) {
+ selectedResource = selectedResource.getParent();
+ }
+
+ // This gives us a directory...
+ //
+ if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+ // Set this for the container.
+ //
+ newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+
+ // Make up a unique new name here.
+ //
+ String defaultModelBaseFilename = ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsEditorFilenameDefaultBase");
+ String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
+ String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
+ for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
+ modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+ }
+ newFileCreationPage.setFileName(modelFilename);
+ }
+ }
+ }
+ initialObjectCreationPage = new ElementsModelWizardInitialObjectCreationPage("Whatever2");
+ initialObjectCreationPage.setTitle(ElementsEditorPlugin.INSTANCE.getString("_UI_ElementsModelWizard_label"));
+ initialObjectCreationPage.setDescription(ElementsEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+ addPage(initialObjectCreationPage);
+ }
+
+ /**
+ * Get the file from the page.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public IFile getModelFile() {
+ return newFileCreationPage.getModelFile();
+ }
+
+}
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements/.classpath b/tests/org.eclipse.emf.diffmerge.tests.elements/.classpath
index ed2bc128..121e527a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements/.project b/tests/org.eclipse.emf.diffmerge.tests.elements/.project
index e902c81f..b87e5f66 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.elements</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.elements</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.elements/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.tests.elements/.settings/org.eclipse.jdt.core.prefs
index d2dd37c5..24fac63b 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.elements/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.tests.elements/.settings/org.eclipse.jdt.core.prefs
@@ -1,99 +1,99 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.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=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-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=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
-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.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
-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=ignore
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.6
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.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=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+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=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=disabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+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.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+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=ignore
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/.project b/tests/org.eclipse.emf.diffmerge.tests.ui/.project
index b79e4ab7..fd7de3be 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/.project
@@ -25,4 +25,15 @@
<nature>org.eclipse.rcptt.core.rcpttnature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
</natures>
+ <filteredResources>
+ <filter>
+ <id>1559637872411</id>
+ <name></name>
+ <type>10</type>
+ <matcher>
+ <id>org.eclipse.ui.ide.multiFilter</id>
+ <arguments>1.0-name-matches-false-false-target</arguments>
+ </matcher>
+ </filter>
+ </filteredResources>
</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml b/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
index 0e1605ec..45a17aac 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.tests</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/.project b/tests/org.eclipse.emf.diffmerge.tests.workspace/.project
index 2693b1fd..e47b245d 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/.project
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.workspace</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.workspace</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/.project b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/.project
index ca60393a..12bb5e4a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/.project
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>PredefinedExamples</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>PredefinedExamples</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex1.elements
index a74371c5..547d738f 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex1.elements
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_P6nkUNc2EeGTgd5oPA9VyA">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_QP530tc2EeGTgd5oPA9VyA" name="N1" outgoing="___g9E9c2EeGYJOctzO5jVQ"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="___g9E9c2EeGYJOctzO5jVQ" name="N1-to-N21" target="_U1x2wtc2EeGTgd5oPA9VyA" source="_QP530tc2EeGTgd5oPA9VyA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_SkVYktc2EeGTgd5oPA9VyA" name="N2">
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_U1x2wtc2EeGTgd5oPA9VyA" name="N21" incoming="___g9E9c2EeGYJOctzO5jVQ" outgoing="_y0z2U9c2EeGYJOctzO5jVQ"/>
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_y0z2U9c2EeGYJOctzO5jVQ" name="N21-to-N22" target="_V75KQtc2EeGTgd5oPA9VyA" source="_U1x2wtc2EeGTgd5oPA9VyA"/>
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_V75KQtc2EeGTgd5oPA9VyA" name="N22" incoming="_y0z2U9c2EeGYJOctzO5jVQ">
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_7ggbItc2EeGYJOctzO5jVQ" name="N221" outgoing="_NP3Y09c3EeGYJOctzO5jVQ"/>
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_NP3Y09c3EeGYJOctzO5jVQ" name="N221-to-N3" target="_JbJKAtc3EeGYJOctzO5jVQ" source="_7ggbItc2EeGYJOctzO5jVQ"/>
- </subNodes>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_JbJKAtc3EeGYJOctzO5jVQ" name="N3" incoming="_NP3Y09c3EeGYJOctzO5jVQ"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_XDDmpNc2EeGTgd5oPA9VyA" name="ToN221" referenced="_7ggbItc2EeGYJOctzO5jVQ"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_P6nkUNc2EeGTgd5oPA9VyA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_QP530tc2EeGTgd5oPA9VyA" name="N1" outgoing="___g9E9c2EeGYJOctzO5jVQ"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="___g9E9c2EeGYJOctzO5jVQ" name="N1-to-N21" target="_U1x2wtc2EeGTgd5oPA9VyA" source="_QP530tc2EeGTgd5oPA9VyA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_SkVYktc2EeGTgd5oPA9VyA" name="N2">
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_U1x2wtc2EeGTgd5oPA9VyA" name="N21" incoming="___g9E9c2EeGYJOctzO5jVQ" outgoing="_y0z2U9c2EeGYJOctzO5jVQ"/>
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_y0z2U9c2EeGYJOctzO5jVQ" name="N21-to-N22" target="_V75KQtc2EeGTgd5oPA9VyA" source="_U1x2wtc2EeGTgd5oPA9VyA"/>
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_V75KQtc2EeGTgd5oPA9VyA" name="N22" incoming="_y0z2U9c2EeGYJOctzO5jVQ">
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_7ggbItc2EeGYJOctzO5jVQ" name="N221" outgoing="_NP3Y09c3EeGYJOctzO5jVQ"/>
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_NP3Y09c3EeGYJOctzO5jVQ" name="N221-to-N3" target="_JbJKAtc3EeGYJOctzO5jVQ" source="_7ggbItc2EeGYJOctzO5jVQ"/>
+ </subNodes>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_JbJKAtc3EeGYJOctzO5jVQ" name="N3" incoming="_NP3Y09c3EeGYJOctzO5jVQ"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_XDDmpNc2EeGTgd5oPA9VyA" name="ToN221" referenced="_7ggbItc2EeGYJOctzO5jVQ"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex2.elements
index 2b0b3735..61bfd8e6 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/Graph/Ex2.elements
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_P6nkUNc2EeGTgd5oPA9VyA">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_QP530tc2EeGTgd5oPA9VyA" name="N1" outgoing="___g9E9c2EeGYJOctzO5jVQ"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="___g9E9c2EeGYJOctzO5jVQ" name="N1-to-N21" target="_U1x2wtc2EeGTgd5oPA9VyA" source="_QP530tc2EeGTgd5oPA9VyA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_l72xc9c3EeGYJOctzO5jVQ" name="N3-to-NB-Container" target="_SkVYktc2EeGTgd5oPA9VyA" source="_JbJKAtc3EeGYJOctzO5jVQ"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_SkVYktc2EeGTgd5oPA9VyA" name="N2-Container" incoming="_l72xc9c3EeGYJOctzO5jVQ">
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_U1x2wtc2EeGTgd5oPA9VyA" name="N21" incoming="___g9E9c2EeGYJOctzO5jVQ" outgoing="_y0z2U9c2EeGYJOctzO5jVQ"/>
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_y0z2U9c2EeGYJOctzO5jVQ" name="N21-to-N22" target="_V75KQtc2EeGTgd5oPA9VyA" source="_U1x2wtc2EeGTgd5oPA9VyA"/>
- <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_V75KQtc2EeGTgd5oPA9VyA" name="N22" incoming="_y0z2U9c2EeGYJOctzO5jVQ"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_JbJKAtc3EeGYJOctzO5jVQ" name="N3" outgoing="_l72xc9c3EeGYJOctzO5jVQ"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_P6nkUNc2EeGTgd5oPA9VyA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_QP530tc2EeGTgd5oPA9VyA" name="N1" outgoing="___g9E9c2EeGYJOctzO5jVQ"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="___g9E9c2EeGYJOctzO5jVQ" name="N1-to-N21" target="_U1x2wtc2EeGTgd5oPA9VyA" source="_QP530tc2EeGTgd5oPA9VyA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_l72xc9c3EeGYJOctzO5jVQ" name="N3-to-NB-Container" target="_SkVYktc2EeGTgd5oPA9VyA" source="_JbJKAtc3EeGYJOctzO5jVQ"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_SkVYktc2EeGTgd5oPA9VyA" name="N2-Container" incoming="_l72xc9c3EeGYJOctzO5jVQ">
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_U1x2wtc2EeGTgd5oPA9VyA" name="N21" incoming="___g9E9c2EeGYJOctzO5jVQ" outgoing="_y0z2U9c2EeGYJOctzO5jVQ"/>
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_y0z2U9c2EeGYJOctzO5jVQ" name="N21-to-N22" target="_V75KQtc2EeGTgd5oPA9VyA" source="_U1x2wtc2EeGTgd5oPA9VyA"/>
+ <subNodes xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_V75KQtc2EeGTgd5oPA9VyA" name="N22" incoming="_y0z2U9c2EeGYJOctzO5jVQ"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_JbJKAtc3EeGYJOctzO5jVQ" name="N3" outgoing="_l72xc9c3EeGYJOctzO5jVQ"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex1.elements
index 9c01adfc..023a6148 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex1.elements
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_EPuzEAB1EeGyf8Q8nDTssA">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_EhUSUAB1EeGyf8Q8nDTssA" name="A"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_I1LUMAB1EeGyf8Q8nDTssA" name="B">
- <manyContent id="_Jx1JsAB1EeGyf8Q8nDTssA" name="C"/>
- <manyContent id="_MIzoIAB1EeGyf8Q8nDTssA" name="D">
- <manyContent id="_Nul6MAB1EeGyf8Q8nDTssA" name="E"/>
- <manyContent id="_QOWhMAB1EeGyf8Q8nDTssA" name="F"/>
- </manyContent>
- <manyContent id="_Oj804AB1EeGyf8Q8nDTssA" name="G">
- <manyContent id="_TrYBsAB1EeGyf8Q8nDTssA" name="H"/>
- <manyContent id="_U4t-kAB1EeGyf8Q8nDTssA" name="I"/>
- </manyContent>
- </content>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_EPuzEAB1EeGyf8Q8nDTssA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_EhUSUAB1EeGyf8Q8nDTssA" name="A"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_I1LUMAB1EeGyf8Q8nDTssA" name="B">
+ <manyContent id="_Jx1JsAB1EeGyf8Q8nDTssA" name="C"/>
+ <manyContent id="_MIzoIAB1EeGyf8Q8nDTssA" name="D">
+ <manyContent id="_Nul6MAB1EeGyf8Q8nDTssA" name="E"/>
+ <manyContent id="_QOWhMAB1EeGyf8Q8nDTssA" name="F"/>
+ </manyContent>
+ <manyContent id="_Oj804AB1EeGyf8Q8nDTssA" name="G">
+ <manyContent id="_TrYBsAB1EeGyf8Q8nDTssA" name="H"/>
+ <manyContent id="_U4t-kAB1EeGyf8Q8nDTssA" name="I"/>
+ </manyContent>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex2.elements
index 70c69503..531edc9f 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/HierarchyAddition/Ex2.elements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_EPuzEAB1EeGyf8Q8nDTssA">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_EhUSUAB1EeGyf8Q8nDTssA" name="A"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_EPuzEAB1EeGyf8Q8nDTssA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_EhUSUAB1EeGyf8Q8nDTssA" name="A"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex1.elements
index ffcf5715..391328a1 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex1.elements
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_z95W4ND3EeGkrIQk3UsRcQ" name="E2"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_60lh4ND3EeGkrIQk3UsRcQ" name="E3" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_z95W4ND3EeGkrIQk3UsRcQ" name="E2"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_60lh4ND3EeGkrIQk3UsRcQ" name="E3" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex2.elements
index bea58614..dfb3f519 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditions/Ex2.elements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex1.elements
index 3b672193..e7f8b628 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex1.elements
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_JhLzouubEeG8ApBgXzSQcA" name="N1"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_P1mYBOubEeG8ApBgXzSQcA" name="RN1" referenced="_JhLzouubEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_RjHpxOubEeG8ApBgXzSQcA" name="RN2" referenced="_P1mYBOubEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_TQyshOubEeG8ApBgXzSQcA" name="RN3" referenced="_RjHpxOubEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_UwKNhOubEeG8ApBgXzSQcA" name="RN4" referenced="_TQyshOubEeG8ApBgXzSQcA"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_JhLzouubEeG8ApBgXzSQcA" name="N1"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_P1mYBOubEeG8ApBgXzSQcA" name="RN1" referenced="_JhLzouubEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_RjHpxOubEeG8ApBgXzSQcA" name="RN2" referenced="_P1mYBOubEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_TQyshOubEeG8ApBgXzSQcA" name="RN3" referenced="_RjHpxOubEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:ReferencingNode" id="_UwKNhOubEeG8ApBgXzSQcA" name="RN4" referenced="_TQyshOubEeG8ApBgXzSQcA"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex2.elements
index 5360d927..025cc1bb 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsMandatory/Ex2.elements
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ"/>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ"/>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex1.elements
index 4d111b27..f710ea4b 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex1.elements
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_EMoGoNJpEeGsPbndICOzvA" name="E4">
- <manyContent id="_z95W4ND3EeGkrIQk3UsRcQ" name="E2"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_60lh4ND3EeGkrIQk3UsRcQ" name="E3" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_EMoGoNJpEeGsPbndICOzvA" name="E4">
+ <manyContent id="_z95W4ND3EeGkrIQk3UsRcQ" name="E2"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_60lh4ND3EeGkrIQk3UsRcQ" name="E3" singleRef="_z95W4ND3EeGkrIQk3UsRcQ"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex2.elements
index bea58614..dfb3f519 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/InterReferencedAdditionsNested/Ex2.elements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_vwx2MND3EeGkrIQk3UsRcQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_yi_fJND3EeGkrIQk3UsRcQ" name="E1"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex1.elements
index 1a400831..d811cdad 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex1.elements
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_s2KhAOuXEeG8ApBgXzSQcA">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_tM9QYuuXEeG8ApBgXzSQcA" name="A" outgoing="_wUfCDeuXEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uGoDUuuXEeG8ApBgXzSQcA" name="B" incoming="_wUfCDeuXEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uamIMuuXEeG8ApBgXzSQcA" name="C"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_wUfCDeuXEeG8ApBgXzSQcA" name="Z" target="_uGoDUuuXEeG8ApBgXzSQcA" source="_tM9QYuuXEeG8ApBgXzSQcA"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_s2KhAOuXEeG8ApBgXzSQcA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_tM9QYuuXEeG8ApBgXzSQcA" name="A" outgoing="_wUfCDeuXEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uGoDUuuXEeG8ApBgXzSQcA" name="B" incoming="_wUfCDeuXEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uamIMuuXEeG8ApBgXzSQcA" name="C"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_wUfCDeuXEeG8ApBgXzSQcA" name="Z" target="_uGoDUuuXEeG8ApBgXzSQcA" source="_tM9QYuuXEeG8ApBgXzSQcA"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex2.elements
index aafc029a..6a1372e2 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MandatoryRefChange/Ex2.elements
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_s2KhAOuXEeG8ApBgXzSQcA">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_tM9QYuuXEeG8ApBgXzSQcA" name="A" outgoing="_wUfCDeuXEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uGoDUuuXEeG8ApBgXzSQcA" name="B"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uamIMuuXEeG8ApBgXzSQcA" name="C" incoming="_wUfCDeuXEeG8ApBgXzSQcA"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_wUfCDeuXEeG8ApBgXzSQcA" name="Z" target="_uamIMuuXEeG8ApBgXzSQcA" source="_tM9QYuuXEeG8ApBgXzSQcA"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_s2KhAOuXEeG8ApBgXzSQcA">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_tM9QYuuXEeG8ApBgXzSQcA" name="A" outgoing="_wUfCDeuXEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uGoDUuuXEeG8ApBgXzSQcA" name="B"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_uamIMuuXEeG8ApBgXzSQcA" name="C" incoming="_wUfCDeuXEeG8ApBgXzSQcA"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Edge" id="_wUfCDeuXEeG8ApBgXzSQcA" name="Z" target="_uamIMuuXEeG8ApBgXzSQcA" source="_tM9QYuuXEeG8ApBgXzSQcA"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex1.elements
index aa42a235..253d3293 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex1.elements
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_AGVm8P_UEeC4E-F0u3n_Ng">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_BDX28P_UEeC4E-F0u3n_Ng" name="A" value="1">
- <manyContent id="_cxbSYP_UEeCtcfaFoBQ8TQ" name="B" value="1"/>
- </content>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_AGVm8P_UEeC4E-F0u3n_Ng">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_BDX28P_UEeC4E-F0u3n_Ng" name="A" value="1">
+ <manyContent id="_cxbSYP_UEeCtcfaFoBQ8TQ" name="B" value="1"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex2.elements
index a56fa450..52d32e63 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/MovedInAdded/Ex2.elements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_AGVm8P_UEeC4E-F0u3n_Ng">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_cxbSYP_UEeCtcfaFoBQ8TQ" name="B" value="2"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_AGVm8P_UEeC4E-F0u3n_Ng">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_cxbSYP_UEeCtcfaFoBQ8TQ" name="B" value="2"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex1.elements
index a8361bf8..35225b34 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex1.elements
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
- <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A" singleRef="_LA6zIP7tEeCRSOEWDs0RCg"/>
- <manyContent id="_Js3xUP7tEeCRSOEWDs0RCg" name="B">
- <manyContent id="_LA6zIP7tEeCRSOEWDs0RCg" name="C"/>
- </manyContent>
-</org.eclipse.emf.diffmerge.tests.elements:Element>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
+ <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A" singleRef="_LA6zIP7tEeCRSOEWDs0RCg"/>
+ <manyContent id="_Js3xUP7tEeCRSOEWDs0RCg" name="B">
+ <manyContent id="_LA6zIP7tEeCRSOEWDs0RCg" name="C"/>
+ </manyContent>
+</org.eclipse.emf.diffmerge.tests.elements:Element>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex2.elements
index 50559311..3b4418ec 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAddition/Ex2.elements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
- <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A"/>
-</org.eclipse.emf.diffmerge.tests.elements:Element>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
+ <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A"/>
+</org.eclipse.emf.diffmerge.tests.elements:Element>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex1.elements
index c565fb28..e47a88b4 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex1.elements
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
- <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A" manyFromManyRef1="_LA6zIP7tEeCRSOEWDs0RCg"/>
- <manyContent id="_Js3xUP7tEeCRSOEWDs0RCg" name="B">
- <manyContent id="_LA6zIP7tEeCRSOEWDs0RCg" name="C" manyFromManyRef2="_wLIccP7sEeCRSOEWDs0RCg"/>
- </manyContent>
-</org.eclipse.emf.diffmerge.tests.elements:Element>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
+ <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A" manyFromManyRef1="_LA6zIP7tEeCRSOEWDs0RCg"/>
+ <manyContent id="_Js3xUP7tEeCRSOEWDs0RCg" name="B">
+ <manyContent id="_LA6zIP7tEeCRSOEWDs0RCg" name="C" manyFromManyRef2="_wLIccP7sEeCRSOEWDs0RCg"/>
+ </manyContent>
+</org.eclipse.emf.diffmerge.tests.elements:Element>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex2.elements
index 50559311..3b4418ec 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/NestedReferencedAdditionOpposites/Ex2.elements
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
- <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A"/>
-</org.eclipse.emf.diffmerge.tests.elements:Element>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Element xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_r_C2gf7sEeCRSOEWDs0RCg" name="ROOT">
+ <manyContent id="_wLIccP7sEeCRSOEWDs0RCg" name="A"/>
+</org.eclipse.emf.diffmerge.tests.elements:Element>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F0.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F0.elements
index 61fbd026..26d155d7 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F0.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F0.elements
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_mjLJcKOOEeOu79LtJq_NIg">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_n-hGEKOOEeOu79LtJq_NIg" name="E1"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_qXGHAKOOEeOu79LtJq_NIg" name="E2"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_mjLJcKOOEeOu79LtJq_NIg">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_n-hGEKOOEeOu79LtJq_NIg" name="E1"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_qXGHAKOOEeOu79LtJq_NIg" name="E2"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F1.elements
index 09043311..8e452a02 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F1.elements
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_wI7iwKOOEeOu79LtJq_NIg" name="">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_2y8jsKOOEeOu79LtJq_NIg" name="RE1">
- <singleRef href="F0.elements#_n-hGEKOOEeOu79LtJq_NIg"/>
- </content>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_wI7iwKOOEeOu79LtJq_NIg" name="">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_2y8jsKOOEeOu79LtJq_NIg" name="RE1">
+ <singleRef href="F0.elements#_n-hGEKOOEeOu79LtJq_NIg"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F2.elements
index 148ecf6e..23f7ccb9 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/MultiFile/F2.elements
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_wI7iwKOOEeOu79LtJq_NIg" name="">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_2y8jsKOOEeOu79LtJq_NIg" name="RE2">
- <singleRef href="F0.elements#_qXGHAKOOEeOu79LtJq_NIg"/>
- </content>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_wI7iwKOOEeOu79LtJq_NIg" name="">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_2y8jsKOOEeOu79LtJq_NIg" name="RE2">
+ <singleRef href="F0.elements#_qXGHAKOOEeOu79LtJq_NIg"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex1.elements
index 47a12c3b..b292895a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex1.elements
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
- id="_P6nkUNc2EeGTgd5oPA9VyA"
- name="Root">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node"
- id="_QP530tc2EeGTgd5oPA9VyA"
- name="N1"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node"
- id="_eLCUoiNGEeaAEdW3kzr8dQ"
- name="N2"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0"
+ id="_P6nkUNc2EeGTgd5oPA9VyA"
+ name="Root">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node"
+ id="_QP530tc2EeGTgd5oPA9VyA"
+ name="N1"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node"
+ id="_eLCUoiNGEeaAEdW3kzr8dQ"
+ name="N2"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex2.elements
index a598cecc..6b679352 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/Strings/Ex2.elements
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_P6nkUNc2EeGTgd5oPA9VyA" name="Root&#xD;&#xA;using&#xD;&#xA;multiline&#xD;&#xA;and&#xD;&#xA;&#x9;tabulation">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_QP530tc2EeGTgd5oPA9VyA" name="New N1"/>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_eLCUoiNGEeaAEdW3kzr8dQ" name="N2"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_P6nkUNc2EeGTgd5oPA9VyA" name="Root&#xD;&#xA;using&#xD;&#xA;multiline&#xD;&#xA;and&#xD;&#xA;&#x9;tabulation">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_QP530tc2EeGTgd5oPA9VyA" name="New N1"/>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Node" id="_eLCUoiNGEeaAEdW3kzr8dQ" name="N2"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex1.elements
index a87533b3..f7839829 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex1.elements
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
- <singleContent id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <singleContent id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex2.elements
index 5a7123c0..de4515a2 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/Ex2.elements
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
- <singleContent id="_YZ7SYf_vEeCtcfaFoBQ8TQ" name="D"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B">
- <singleContent id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C"/>
- </content>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <singleContent id="_YZ7SYf_vEeCtcfaFoBQ8TQ" name="D"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B">
+ <singleContent id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex1.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex1.elements
index 0b0b1be4..c392c0e4 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex1.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex1.elements
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
- <singleContent id="_7fg_MQWZEeGUP-2zOBX_FA" name="D"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B">
- <singleContent id="_AYvX8QWaEeGUP-2zOBX_FA" name="E"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C"/>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <singleContent id="_7fg_MQWZEeGUP-2zOBX_FA" name="D"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B">
+ <singleContent id="_AYvX8QWaEeGUP-2zOBX_FA" name="E"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C"/>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex2.elements b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex2.elements
index 93c1136f..697868e7 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex2.elements
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/PredefinedExamples/_others/UniqueAddition/bigger/Ex2.elements
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
- <singleContent id="_JN8eEQWaEeGUP-2zOBX_FA" name="F"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B">
- <singleContent id="_7fg_MQWZEeGUP-2zOBX_FA" name="D"/>
- </content>
- <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C">
- <singleContent id="_AYvX8QWaEeGUP-2zOBX_FA" name="E"/>
- </content>
-</org.eclipse.emf.diffmerge.tests.elements:Root>
+<?xml version="1.0" encoding="UTF-8"?>
+<org.eclipse.emf.diffmerge.tests.elements:Root xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.emf.diffmerge.tests.elements="http://www.eclipse.org/emf/diffmerge/tests/elements/1.0.0" id="_Ld8kIP_vEeCtcfaFoBQ8TQ">
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_Lzbr8P_vEeCtcfaFoBQ8TQ" name="A">
+ <singleContent id="_JN8eEQWaEeGUP-2zOBX_FA" name="F"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_OdRcAP_vEeCtcfaFoBQ8TQ" name="B">
+ <singleContent id="_7fg_MQWZEeGUP-2zOBX_FA" name="D"/>
+ </content>
+ <content xsi:type="org.eclipse.emf.diffmerge.tests.elements:Element" id="_PmVV0f_vEeCtcfaFoBQ8TQ" name="C">
+ <singleContent id="_AYvX8QWaEeGUP-2zOBX_FA" name="E"/>
+ </content>
+</org.eclipse.emf.diffmerge.tests.elements:Root>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.workspace/build.properties b/tests/org.eclipse.emf.diffmerge.tests.workspace/build.properties
index 5e372855..5f22cdd4 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.workspace/build.properties
+++ b/tests/org.eclipse.emf.diffmerge.tests.workspace/build.properties
@@ -1 +1 @@
-bin.includes = META-INF/
+bin.includes = META-INF/
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.classpath b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.classpath
index 8a8f1668..ad32c83a 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.classpath
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
index 2045fe55..4d44e3c2 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.diffmerge.tests.wt.elements</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.emf.diffmerge.tests.wt.elements</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.settings/org.eclipse.jdt.core.prefs
index db7f4fc9..576e03f9 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/.settings/org.eclipse.jdt.core.prefs
@@ -1,8 +1,8 @@
-#Tue Aug 21 14:31:36 CEST 2012
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+#Tue Aug 21 14:31:36 CEST 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/EDM-WT-Tests.launch b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/EDM-WT-Tests.launch
index 986856cc..1957252d 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/EDM-WT-Tests.launch
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/EDM-WT-Tests.launch
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc:org.eclipse.emf.diffmerge.tests.workspace/testWk}"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="2"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.emf.diffmerge.tests.wt.elements/src&lt;org.eclipse.emf.diffmerge.tests.wt.elements.cases"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -clean"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.diffmerge.tests.wt.elements"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc:org.eclipse.emf.diffmerge.tests.workspace/testWk}"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="2"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.eclipse.emf.diffmerge.tests.wt.elements/src&lt;org.eclipse.emf.diffmerge.tests.wt.elements.cases"/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -clean"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.diffmerge.tests.wt.elements"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/Activator.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/Activator.java
index 0ea603fc..469d06cd 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/Activator.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/Activator.java
@@ -1,30 +1,30 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- private static BundleContext context;
-
- static BundleContext getContext() {
- return context;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext bundleContext) throws Exception {
- Activator.context = bundleContext;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext bundleContext) throws Exception {
- Activator.context = null;
- }
-
-}
+package org.eclipse.emf.diffmerge.tests.wt.elements;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator {
+
+ private static BundleContext context;
+
+ static BundleContext getContext() {
+ return context;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext bundleContext) throws Exception {
+ Activator.context = bundleContext;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext bundleContext) throws Exception {
+ Activator.context = null;
+ }
+
+}
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/TestUtil.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/TestUtil.java
index 57a71a49..10cb7ff9 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/TestUtil.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/TestUtil.java
@@ -1,27 +1,27 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.locator.ShellLocator;
-
-
-/**
- * A utility class for tests
- */
-public class TestUtil {
-
- private TestUtil() {}
-
-
- /**
- * Wait for the shell to be closed
- * @param ui a non-null WindowTester UI context
- * @throws Exception
- */
- public static void waitForClosing(IUIContext ui) throws Exception {
- ui.ensureThat(new ShellLocator(
- "Plug-in Development - Compare - Eclipse Platform").isClosed());
- ui.wait(new ShellDisposedCondition("Eclipse Platform"));
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.locator.ShellLocator;
+
+
+/**
+ * A utility class for tests
+ */
+public class TestUtil {
+
+ private TestUtil() {}
+
+
+ /**
+ * Wait for the shell to be closed
+ * @param ui a non-null WindowTester UI context
+ * @throws Exception
+ */
+ public static void waitForClosing(IUIContext ui) throws Exception {
+ ui.ensureThat(new ShellLocator(
+ "Plug-in Development - Compare - Eclipse Platform").isClosed());
+ ui.wait(new ShellDisposedCondition("Eclipse Platform"));
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/Graph.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/Graph.java
index 68057e6c..f5eb51bf 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/Graph.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/Graph.java
@@ -1,52 +1,52 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Basic differences on a graph model
- */
-public class Graph extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testGraph() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (8)/Edge N3-to-NB-Container",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (8)/Node N2 (4)", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (8)", new SWTWidgetLocator(Tree.class,
- new SWTWidgetLocator(Composite.class, 0, new SWTWidgetLocator(
- SashForm.class)))));
- ui.click(new TreeItemLocator("Root (8)/Node N2 (4)/Node N22 (2)",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (8)/Node N2 (4)/Node N22 (2)/Node N221",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator(
- "Root (8)/Node N2 (4)/Node N22 (2)/Edge N221-to-N3",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (8)/Node N3 (2)", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (8)/Referencing Node ToN221", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- closeEditors();
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Basic differences on a graph model
+ */
+public class Graph extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testGraph() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (8)/Edge N3-to-NB-Container",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (8)/Node N2 (4)", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (8)", new SWTWidgetLocator(Tree.class,
+ new SWTWidgetLocator(Composite.class, 0, new SWTWidgetLocator(
+ SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (8)/Node N2 (4)/Node N22 (2)",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (8)/Node N2 (4)/Node N22 (2)/Node N221",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator(
+ "Root (8)/Node N2 (4)/Node N22 (2)/Edge N221-to-N3",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (8)/Node N3 (2)", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (8)/Referencing Node ToN221", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ closeEditors();
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/HierarchyAddition.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/HierarchyAddition.java
index 7b8b12a0..caba567f 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/HierarchyAddition.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/HierarchyAddition.java
@@ -1,91 +1,91 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Merge addition/deletion in a hierarchy (container-child dependency).
- * Persistence check.
- */
-public class HierarchyAddition extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testHierarchyAddition() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (8)/Element B (7)/Element D (2)",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("Include differences in children"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator("Element E/Deletion", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
- ui.click(new TreeItemLocator("Element F/Deletion", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.click(new TreeItemLocator(
- "Root (5)/Element B (4)/Element G (2)/Element H", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator(
- "Element B/Addition into Root (via 'content')", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
- ui.click(new TreeItemLocator(
- "Element G/Addition into Element B (via 'manyContent')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- checkPersistence();
- closeEditors();
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase#persistenceChecks(com.windowtester.runtime.IUIContext)
- */
- @Override
- protected void persistenceChecks(IUIContext ui) throws Exception {
- ui.click(new TreeItemLocator(
- "Root (2)/Element B (2)/Element G (1)/Element I", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (2)/Element B (2)/Element C",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Merge addition/deletion in a hierarchy (container-child dependency).
+ * Persistence check.
+ */
+public class HierarchyAddition extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testHierarchyAddition() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (8)/Element B (7)/Element D (2)",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("Include differences in children"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator("Element E/Deletion", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
+ ui.click(new TreeItemLocator("Element F/Deletion", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.click(new TreeItemLocator(
+ "Root (5)/Element B (4)/Element G (2)/Element H", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator(
+ "Element B/Addition into Root (via 'content')", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
+ ui.click(new TreeItemLocator(
+ "Element G/Addition into Element B (via 'manyContent')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ checkPersistence();
+ closeEditors();
+ }
+
+ /**
+ * @see org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase#persistenceChecks(com.windowtester.runtime.IUIContext)
+ */
+ @Override
+ protected void persistenceChecks(IUIContext ui) throws Exception {
+ ui.click(new TreeItemLocator(
+ "Root (2)/Element B (2)/Element G (1)/Element I", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (2)/Element B (2)/Element C",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditions.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditions.java
index 9927c58e..f90cff8b 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditions.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditions.java
@@ -1,57 +1,57 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Deletion of an element referenced by elements present and absent in the opposite scope.
- * Persistence check.
- */
-public class InterReferencedAdditions extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testInterReferencedAdditions() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (3)/Element E2", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- checkPersistence();
- closeEditors();
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase#persistenceChecks(com.windowtester.runtime.IUIContext)
- */
- @Override
- protected void persistenceChecks(IUIContext ui) throws Exception {
- ui.click(new TreeItemLocator("Root (1)/Element E3", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Deletion of an element referenced by elements present and absent in the opposite scope.
+ * Persistence check.
+ */
+public class InterReferencedAdditions extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testInterReferencedAdditions() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (3)/Element E2", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ checkPersistence();
+ closeEditors();
+ }
+
+ /**
+ * @see org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase#persistenceChecks(com.windowtester.runtime.IUIContext)
+ */
+ @Override
+ protected void persistenceChecks(IUIContext ui) throws Exception {
+ ui.click(new TreeItemLocator("Root (1)/Element E3", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsMandatory.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsMandatory.java
index 210d3d12..c77e1210 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsMandatory.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsMandatory.java
@@ -1,89 +1,89 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Addition/deletion of a chain of elements due to a mandatory reference.
- */
-public class InterReferencedAdditionsMandatory extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testInterReferencedAdditionsMandatory() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (5)/Node N1", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator("Node N1/Deletion", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Required changes"))));
- ui.click(new TreeItemLocator("Referencing Node RN1/Deletion",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new TreeItemLocator("Referencing Node RN2/Deletion",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new TreeItemLocator("Referencing Node RN3/Deletion",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new TreeItemLocator("Referencing Node RN4/Deletion",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new ButtonLocator("Cancel"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.click(new TreeItemLocator("Root (5)/Referencing Node RN4",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator(
- "Referencing Node RN4/Addition into Root (via 'content')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Required changes"))));
- ui.click(new TreeItemLocator("Node N1/Addition into Root (via 'content')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new TreeItemLocator(
- "Referencing Node RN1/Addition into Root (via 'content')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new TreeItemLocator(
- "Referencing Node RN2/Addition into Root (via 'content')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new TreeItemLocator(
- "Referencing Node RN3/Addition into Root (via 'content')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new ButtonLocator("OK"));
- closeEditors();
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Addition/deletion of a chain of elements due to a mandatory reference.
+ */
+public class InterReferencedAdditionsMandatory extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testInterReferencedAdditionsMandatory() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (5)/Node N1", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator("Node N1/Deletion", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Required changes"))));
+ ui.click(new TreeItemLocator("Referencing Node RN1/Deletion",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new TreeItemLocator("Referencing Node RN2/Deletion",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new TreeItemLocator("Referencing Node RN3/Deletion",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new TreeItemLocator("Referencing Node RN4/Deletion",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new ButtonLocator("Cancel"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.click(new TreeItemLocator("Root (5)/Referencing Node RN4",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator(
+ "Referencing Node RN4/Addition into Root (via 'content')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Required changes"))));
+ ui.click(new TreeItemLocator("Node N1/Addition into Root (via 'content')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new TreeItemLocator(
+ "Referencing Node RN1/Addition into Root (via 'content')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new TreeItemLocator(
+ "Referencing Node RN2/Addition into Root (via 'content')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new TreeItemLocator(
+ "Referencing Node RN3/Addition into Root (via 'content')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new ButtonLocator("OK"));
+ closeEditors();
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsNested.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsNested.java
index 2d0484c5..87345a37 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsNested.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/InterReferencedAdditionsNested.java
@@ -1,67 +1,67 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Same as InterReferencedAdditions, except that the element deleted is nested.
- * Persistence check.
- */
-public class InterReferencedAdditionsNested extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testInterReferencedAdditionsNested() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (4)/Element E4 (1)/Element E2",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator("Element E2/Deletion", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Required changes"))));
- ui.click(new TreeItemLocator(
- "Element E1/Reference 'singleRef': deletion of Element E2",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- checkPersistence();
- closeEditors();
- }
-
- /**
- * @see org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase#persistenceChecks(com.windowtester.runtime.IUIContext)
- */
- @Override
- protected void persistenceChecks(IUIContext ui) throws Exception {
- ui.click(new TreeItemLocator("Root (2)/Element E3", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (2)/Element E4", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Same as InterReferencedAdditions, except that the element deleted is nested.
+ * Persistence check.
+ */
+public class InterReferencedAdditionsNested extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testInterReferencedAdditionsNested() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (4)/Element E4 (1)/Element E2",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator("Element E2/Deletion", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Required changes"))));
+ ui.click(new TreeItemLocator(
+ "Element E1/Reference 'singleRef': deletion of Element E2",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ checkPersistence();
+ closeEditors();
+ }
+
+ /**
+ * @see org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase#persistenceChecks(com.windowtester.runtime.IUIContext)
+ */
+ @Override
+ protected void persistenceChecks(IUIContext ui) throws Exception {
+ ui.click(new TreeItemLocator("Root (2)/Element E3", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (2)/Element E4", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MandatoryRefChange.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MandatoryRefChange.java
index abc13f68..659dde28 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MandatoryRefChange.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MandatoryRefChange.java
@@ -1,66 +1,66 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TableItemLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Multiple reference changes resulting from the deletion of a reference value.
- * Persistence check.
- */
-public class MandatoryRefChange extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testMandatoryRefChange() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (3)/Node C (1)", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TableItemLocator("Edge Z (in Root)"));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 2, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator(
- "Node C/Reference 'incoming': deletion of Edge Z",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Required changes"))));
- ui.click(new TreeItemLocator(
- "Edge Z/Reference 'target': addition of Node B", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
- ui.click(new TreeItemLocator(
- "Edge Z/Reference 'target': deletion of Node C", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
- ui.click(new TreeItemLocator(
- "Node B/Reference 'incoming': addition of Edge Z",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- closeCompareEditor(true);
- checkModelIsValid(true);
- checkModelIsValid(false);
- checkIdentical();
- closeEditors();
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TableItemLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Multiple reference changes resulting from the deletion of a reference value.
+ * Persistence check.
+ */
+public class MandatoryRefChange extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testMandatoryRefChange() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (3)/Node C (1)", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TableItemLocator("Edge Z (in Root)"));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 2, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 2, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator(
+ "Node C/Reference 'incoming': deletion of Edge Z",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Required changes"))));
+ ui.click(new TreeItemLocator(
+ "Edge Z/Reference 'target': addition of Node B", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
+ ui.click(new TreeItemLocator(
+ "Edge Z/Reference 'target': deletion of Node C", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Implied changes"))));
+ ui.click(new TreeItemLocator(
+ "Node B/Reference 'incoming': addition of Edge Z",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ closeCompareEditor(true);
+ checkModelIsValid(true);
+ checkModelIsValid(false);
+ checkIdentical();
+ closeEditors();
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MovedInAdded.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MovedInAdded.java
index ce3920b6..97cf5093 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MovedInAdded.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/MovedInAdded.java
@@ -1,83 +1,83 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TableItemLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Element moved in an added element.
- * Persistence check.
- */
-public class MovedInAdded extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testMovedInAdded() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Root (3)/Element A (2)/Element B (2)",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TreeItemLocator("Root (3)/Element A (2)",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("Include differences in children"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new TreeItemLocator(
- "Element A/Addition into Root (via 'content')", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Group.class, "Required changes"))));
- ui.click(new TreeItemLocator(
- "Element B/Move into Element A (via 'manyContent')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Required changes"))));
- ui.click(new TreeItemLocator("Element B/Move out of Root (from 'content')",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
- "Implied changes"))));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.click(new TreeItemLocator("Root (1)/Element A (1)/Element B (1)",
- new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
- 0, new SWTWidgetLocator(SashForm.class)))));
- ui.click(new TableItemLocator("value"));
- ui.click(new TableItemLocator("1"));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- closeCompareEditor(true);
- checkModelIsValid(true);
- checkModelIsValid(false);
- checkIdentical();
- closeEditors();
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TableItemLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Element moved in an added element.
+ * Persistence check.
+ */
+public class MovedInAdded extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testMovedInAdded() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Root (3)/Element A (2)/Element B (2)",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TreeItemLocator("Root (3)/Element A (2)",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("Include differences in children"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new TreeItemLocator(
+ "Element A/Addition into Root (via 'content')", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Group.class, "Required changes"))));
+ ui.click(new TreeItemLocator(
+ "Element B/Move into Element A (via 'manyContent')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Required changes"))));
+ ui.click(new TreeItemLocator("Element B/Move out of Root (from 'content')",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Group.class,
+ "Implied changes"))));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.click(new TreeItemLocator("Root (1)/Element A (1)/Element B (1)",
+ new SWTWidgetLocator(Tree.class, new SWTWidgetLocator(Composite.class,
+ 0, new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new TableItemLocator("value"));
+ ui.click(new TableItemLocator("1"));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ closeCompareEditor(true);
+ checkModelIsValid(true);
+ checkModelIsValid(false);
+ checkIdentical();
+ closeEditors();
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAddition.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAddition.java
index 60543093..8b435468 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAddition.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAddition.java
@@ -1,53 +1,53 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Addition of reference to added nested element.
- * Persistence check.
- */
-public class NestedReferencedAddition extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testNestedReferenceAddition() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Element ROOT (3)", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- closeCompareEditor(true);
- checkModelIsValid(true);
- checkModelIsValid(false);
- checkIdentical();
- closeEditors();
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Addition of reference to added nested element.
+ * Persistence check.
+ */
+public class NestedReferencedAddition extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testNestedReferenceAddition() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Element ROOT (3)", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ closeCompareEditor(true);
+ checkModelIsValid(true);
+ checkModelIsValid(false);
+ checkIdentical();
+ closeEditors();
+ }
+
} \ No newline at end of file
diff --git a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAdditionOpposites.java b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAdditionOpposites.java
index 45c94763..3380270c 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAdditionOpposites.java
+++ b/tests/org.eclipse.emf.diffmerge.tests.wt.elements/src/org/eclipse/emf/diffmerge/tests/wt/elements/cases/NestedReferencedAdditionOpposites.java
@@ -1,53 +1,53 @@
-package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
-
-import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Tree;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-
-
-/**
- * Addition of reference with eOpposite to added nested element.
- * Persistence check.
- */
-public class NestedReferencedAdditionOpposites extends DiffMergeTestCase {
-
- /**
- * Main test method.
- */
- public void testNestedReferenceAddition() throws Exception {
- IUIContext ui = getUI();
- compareInFolder(true);
- ui.click(new TreeItemLocator("Element ROOT (3)", new SWTWidgetLocator(
- Tree.class, new SWTWidgetLocator(Composite.class, 0,
- new SWTWidgetLocator(SashForm.class)))));
- ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
- ToolBar.class, new SWTWidgetLocator(Composite.class,
- new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
- SashForm.class))))));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- ui.wait(new ShellShowingCondition("Merge Operation"));
- ui.click(new ButtonLocator("OK"));
- ui.wait(new ShellDisposedCondition("Merge Operation"));
- ui.wait(new ShellDisposedCondition("Progress Information"));
- closeCompareEditor(true);
- checkModelIsValid(true);
- checkModelIsValid(false);
- checkIdentical();
- closeEditors();
- }
-
+package org.eclipse.emf.diffmerge.tests.wt.elements.cases;
+
+import org.eclipse.emf.diffmerge.tests.wt.elements.DiffMergeTestCase;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.ToolBar;
+import org.eclipse.swt.widgets.ToolItem;
+import org.eclipse.swt.widgets.Tree;
+
+import com.windowtester.runtime.IUIContext;
+import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
+import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
+import com.windowtester.runtime.swt.locator.ButtonLocator;
+import com.windowtester.runtime.swt.locator.SWTWidgetLocator;
+import com.windowtester.runtime.swt.locator.TreeItemLocator;
+
+
+/**
+ * Addition of reference with eOpposite to added nested element.
+ * Persistence check.
+ */
+public class NestedReferencedAdditionOpposites extends DiffMergeTestCase {
+
+ /**
+ * Main test method.
+ */
+ public void testNestedReferenceAddition() throws Exception {
+ IUIContext ui = getUI();
+ compareInFolder(true);
+ ui.click(new TreeItemLocator("Element ROOT (3)", new SWTWidgetLocator(
+ Tree.class, new SWTWidgetLocator(Composite.class, 0,
+ new SWTWidgetLocator(SashForm.class)))));
+ ui.click(new SWTWidgetLocator(ToolItem.class, "", 0, new SWTWidgetLocator(
+ ToolBar.class, new SWTWidgetLocator(Composite.class,
+ new SWTWidgetLocator(Composite.class, 1, new SWTWidgetLocator(
+ SashForm.class))))));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ ui.wait(new ShellShowingCondition("Merge Operation"));
+ ui.click(new ButtonLocator("OK"));
+ ui.wait(new ShellDisposedCondition("Merge Operation"));
+ ui.wait(new ShellDisposedCondition("Progress Information"));
+ closeCompareEditor(true);
+ checkModelIsValid(true);
+ checkModelIsValid(false);
+ checkIdentical();
+ closeEditors();
+ }
+
} \ No newline at end of file
diff --git a/tests/pom.xml b/tests/pom.xml
index 81afa969..aaa78719 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.2-SNAPSHOT</version>
</parent>
<build>

Back to the top