Merge branch 'maintenance_1.8' into develop
# Conflicts:
# bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
# bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
# bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
# bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
# bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
# bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
# bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
# bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.client/pom.xml
# bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
# bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.common.model/pom.xml
# bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.common/pom.xml
# bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.ecore/pom.xml
# bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
# bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
# bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
# bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
# bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
# bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
# bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
# bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
# bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
# bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
# bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
# bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
# bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.migration/pom.xml
# bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
# bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
# bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
# bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
# bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
# bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.server.model/pom.xml
# bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
# bundles/org.eclipse.emf.emfstore.server/pom.xml
# features/org.eclipse.emf.emfstore.client.feature/feature.xml
# features/org.eclipse.emf.emfstore.client.feature/pom.xml
# features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
# features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
# features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
# features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
# features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
# features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
# features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
# features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
# features/org.eclipse.emf.emfstore.common.feature/feature.xml
# features/org.eclipse.emf.emfstore.common.feature/pom.xml
# features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
# features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
# features/org.eclipse.emf.emfstore.example.feature/feature.xml
# features/org.eclipse.emf.emfstore.example.feature/pom.xml
# features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
# features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
# features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
# features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
# features/org.eclipse.emf.emfstore.license.feature/feature.xml
# features/org.eclipse.emf.emfstore.license.feature/pom.xml
# features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
# features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
# features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
# features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
# features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
# features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
# features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
# features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
# features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
# features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
# features/org.eclipse.emf.emfstore.server.feature/feature.xml
# features/org.eclipse.emf.emfstore.server.feature/pom.xml
# features/org.eclipse.emf.emfstore.test.feature/feature.xml
# features/org.eclipse.emf.emfstore.test.feature/pom.xml
# releng/_target/pom.xml
# releng/emfstore-parent/pom.xml
# releng/org.eclipse.emf.emfstore.p2repository/pom.xml
# releng/org.eclipse.emf.emfstore.products/pom.xml
# releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
# releng/org.eclipse.emf.emfstore.releng.features/pom.xml
# releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
# tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
# tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
# tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
# tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
# tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
# tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
# tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.test/pom.xml
# tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
# tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
# tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
# tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
# tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.performance.test/pom.xml
# tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.server.test/pom.xml
# tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
# tests/org.eclipse.emf.emfstore.test.common/pom.xml
# tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
# tests/org.eclipse.emf.emfstore.test.model/pom.xml
diff --git a/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.branding/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
index f4a39cd..b9d2b8a 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client Model Edit
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.model.edit;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.emfstore.internal.client.model.provider.ClientModelEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
@@ -12,11 +12,11 @@
r;uses:="org.eclipse.emf.ecore, org.eclipse.emf.emfstore.internal.co
mmon.model.provider, org.eclipse.emf.common.util, org.eclipse.emf.c
ommon, org.eclipse.emf.edit.provider, org.eclipse.emf.common.notify
- , org.eclipse.emf.emfstore.internal.client.model.util";version="1.8.
- 1"
-Require-Bundle: org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ , org.eclipse.emf.emfstore.internal.client.model.util";version="1.9.
+ 0"
+Require-Bundle: org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/icons/full/ctool16/CreateProjectSpace_localChangePackage_ChangePackageProxy.gif b/bundles/org.eclipse.emf.emfstore.client.model.edit/icons/full/ctool16/CreateProjectSpace_localChangePackage_ChangePackageProxy.gif
new file mode 100644
index 0000000..d8233b0
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/icons/full/ctool16/CreateProjectSpace_localChangePackage_ChangePackageProxy.gif
Binary files differ
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/icons/full/ctool16/CreateProjectSpace_localChangePackage_FileBasedChangePackage.gif b/bundles/org.eclipse.emf.emfstore.client.model.edit/icons/full/ctool16/CreateProjectSpace_localChangePackage_FileBasedChangePackage.gif
new file mode 100644
index 0000000..14bbb4b
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/icons/full/ctool16/CreateProjectSpace_localChangePackage_FileBasedChangePackage.gif
Binary files differ
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
index 86f3922..977172a 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.model.edit</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ClientModelEditPlugin.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ClientModelEditPlugin.java
index 071b094..cbb1726 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ClientModelEditPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ClientModelEditPlugin.java
@@ -45,8 +45,7 @@
* @generated
*/
public ClientModelEditPlugin() {
- super(new ResourceLocator[]
- {
+ super(new ResourceLocator[] {
CommonEditPlugin.INSTANCE,
ServerEditPlugin.INSTANCE,
});
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ModelItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ModelItemProviderAdapterFactory.java
index a58ff34..6486e4c 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ModelItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ModelItemProviderAdapterFactory.java
@@ -97,8 +97,7 @@
*/
@Override
public Adapter createWorkspaceAdapter() {
- if (workspaceItemProvider == null)
- {
+ if (workspaceItemProvider == null) {
workspaceItemProvider = new WorkspaceItemProvider(this);
}
@@ -123,8 +122,7 @@
*/
@Override
public Adapter createServerInfoAdapter() {
- if (serverInfoItemProvider == null)
- {
+ if (serverInfoItemProvider == null) {
serverInfoItemProvider = new ServerInfoItemProvider(this);
}
@@ -149,8 +147,7 @@
*/
@Override
public Adapter createUsersessionAdapter() {
- if (usersessionItemProvider == null)
- {
+ if (usersessionItemProvider == null) {
usersessionItemProvider = new UsersessionItemProvider(this);
}
@@ -175,8 +172,7 @@
*/
@Override
public Adapter createProjectSpaceAdapter() {
- if (projectSpaceItemProvider == null)
- {
+ if (projectSpaceItemProvider == null) {
projectSpaceItemProvider = new ProjectSpaceItemProvider(this);
}
@@ -201,8 +197,7 @@
*/
@Override
public Adapter createPendingFileTransferAdapter() {
- if (pendingFileTransferItemProvider == null)
- {
+ if (pendingFileTransferItemProvider == null) {
pendingFileTransferItemProvider = new PendingFileTransferItemProvider(this);
}
@@ -258,11 +253,9 @@
*/
@Override
public Object adapt(Object object, Object type) {
- if (isFactoryForType(type))
- {
+ if (isFactoryForType(type)) {
final Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
- {
+ if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
return adapter;
}
}
@@ -300,8 +293,7 @@
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null)
- {
+ if (parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/PendingFileTransferItemProvider.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/PendingFileTransferItemProvider.java
index 2d3ba4c..06e6c21 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/PendingFileTransferItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/PendingFileTransferItemProvider.java
@@ -57,8 +57,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addFileVersionPropertyDescriptor(object);
@@ -78,13 +77,11 @@
*/
protected void addFileVersionPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PendingFileTransfer_fileVersion_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_fileVersion_feature", "_UI_PendingFileTransfer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_fileVersion_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_PendingFileTransfer_type"), //$NON-NLS-1$
ModelPackage.Literals.PENDING_FILE_TRANSFER__FILE_VERSION,
true,
false,
@@ -102,13 +99,11 @@
*/
protected void addChunkNumberPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PendingFileTransfer_chunkNumber_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_chunkNumber_feature", "_UI_PendingFileTransfer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_chunkNumber_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_PendingFileTransfer_type"), //$NON-NLS-1$
ModelPackage.Literals.PENDING_FILE_TRANSFER__CHUNK_NUMBER,
true,
false,
@@ -126,13 +121,11 @@
*/
protected void addUploadPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PendingFileTransfer_upload_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_upload_feature", "_UI_PendingFileTransfer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_upload_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_PendingFileTransfer_type"), //$NON-NLS-1$
ModelPackage.Literals.PENDING_FILE_TRANSFER__UPLOAD,
true,
false,
@@ -150,13 +143,11 @@
*/
protected void addFileNamePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PendingFileTransfer_fileName_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_fileName_feature", "_UI_PendingFileTransfer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_fileName_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_PendingFileTransfer_type"), //$NON-NLS-1$
ModelPackage.Literals.PENDING_FILE_TRANSFER__FILE_NAME,
true,
false,
@@ -174,13 +165,11 @@
*/
protected void addPreliminaryFileNamePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PendingFileTransfer_preliminaryFileName_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_preliminaryFileName_feature", "_UI_PendingFileTransfer_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PendingFileTransfer_preliminaryFileName_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_PendingFileTransfer_type"), //$NON-NLS-1$
ModelPackage.Literals.PENDING_FILE_TRANSFER__PRELIMINARY_FILE_NAME,
true,
false,
@@ -201,8 +190,7 @@
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null)
- {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ModelPackage.Literals.PENDING_FILE_TRANSFER__ATTACHMENT_ID);
}
@@ -242,8 +230,7 @@
@Override
public String getText(Object object) {
final String label = ((PendingFileTransfer) object).getFileName();
- return label == null || label.length() == 0 ?
- getString("_UI_PendingFileTransfer_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_PendingFileTransfer_type") : //$NON-NLS-1$
getString("_UI_PendingFileTransfer_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -258,8 +245,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(PendingFileTransfer.class))
- {
+ switch (notification.getFeatureID(PendingFileTransfer.class)) {
case ModelPackage.PENDING_FILE_TRANSFER__FILE_VERSION:
case ModelPackage.PENDING_FILE_TRANSFER__CHUNK_NUMBER:
case ModelPackage.PENDING_FILE_TRANSFER__UPLOAD:
@@ -285,10 +271,8 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PENDING_FILE_TRANSFER__ATTACHMENT_ID,
- ModelFactory.eINSTANCE.createModelElementId()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PENDING_FILE_TRANSFER__ATTACHMENT_ID,
+ ModelFactory.eINSTANCE.createModelElementId()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ProjectSpaceItemProvider.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ProjectSpaceItemProvider.java
index d63f84c..175d755 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ProjectSpaceItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ProjectSpaceItemProvider.java
@@ -88,13 +88,11 @@
*/
protected void addProjectNamePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_projectName_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_projectName_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_projectName_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__PROJECT_NAME,
true,
false,
@@ -112,13 +110,11 @@
*/
protected void addProjectDescriptionPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_projectDescription_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_projectDescription_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_projectDescription_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__PROJECT_DESCRIPTION,
true,
false,
@@ -136,13 +132,11 @@
*/
protected void addUsersessionPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_usersession_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_usersession_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_usersession_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__USERSESSION,
true,
false,
@@ -160,13 +154,11 @@
*/
protected void addLastUpdatedPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_lastUpdated_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_lastUpdated_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_lastUpdated_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__LAST_UPDATED,
true,
false,
@@ -184,13 +176,11 @@
*/
protected void addResourceCountPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_resourceCount_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_resourceCount_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_resourceCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__RESOURCE_COUNT,
true,
false,
@@ -207,13 +197,12 @@
* @generated
*/
protected void addDirtyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_dirty_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_dirty_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_dirty_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__DIRTY,
true,
false,
@@ -231,13 +220,11 @@
*/
protected void addOldLogMessagesPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_oldLogMessages_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_oldLogMessages_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_oldLogMessages_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__OLD_LOG_MESSAGES,
true,
false,
@@ -256,13 +243,11 @@
*/
protected void addChangedSharedPropertiesPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ProjectSpace_changedSharedProperties_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectSpace_changedSharedProperties_feature", "_UI_ProjectSpace_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectSpace_changedSharedProperties_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ProjectSpace_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_SPACE__CHANGED_SHARED_PROPERTIES,
true,
false,
@@ -282,8 +267,7 @@
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null)
- {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ModelPackage.Literals.PROJECT_SPACE__PROJECT);
childrenFeatures.add(ModelPackage.Literals.PROJECT_SPACE__PROJECT_ID);
@@ -368,8 +352,7 @@
private void notifyChangedGen(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(ProjectSpace.class))
- {
+ switch (notification.getFeatureID(ProjectSpace.class)) {
case ModelPackage.PROJECT_SPACE__PROJECT_NAME:
case ModelPackage.PROJECT_SPACE__PROJECT_DESCRIPTION:
case ModelPackage.PROJECT_SPACE__LAST_UPDATED:
@@ -402,45 +385,32 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__PROJECT,
- ModelFactory.eINSTANCE.createProject()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__PROJECT,
+ ModelFactory.eINSTANCE.createProject()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__PROJECT_ID,
- org.eclipse.emf.emfstore.internal.server.model.ModelFactory.eINSTANCE.createProjectId()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__PROJECT_ID,
+ org.eclipse.emf.emfstore.internal.server.model.ModelFactory.eINSTANCE.createProjectId()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__BASE_VERSION,
- VersioningFactory.eINSTANCE.createPrimaryVersionSpec()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__BASE_VERSION,
+ VersioningFactory.eINSTANCE.createPrimaryVersionSpec()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__WAITING_UPLOADS,
- org.eclipse.emf.emfstore.internal.server.model.ModelFactory.eINSTANCE.createFileIdentifier()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__WAITING_UPLOADS,
+ org.eclipse.emf.emfstore.internal.server.model.ModelFactory.eINSTANCE.createFileIdentifier()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__PROPERTIES,
- ModelFactory.eINSTANCE.createEMFStoreProperty()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__PROPERTIES,
+ ModelFactory.eINSTANCE.createEMFStoreProperty()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE,
- VersioningFactory.eINSTANCE.createChangePackage()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE,
+ VersioningFactory.eINSTANCE.createChangePackage()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE,
- VersioningFactory.eINSTANCE.createFileBasedChangePackage()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE,
+ VersioningFactory.eINSTANCE.createFileBasedChangePackage()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT_SPACE__MERGED_VERSION,
- VersioningFactory.eINSTANCE.createPrimaryVersionSpec()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE,
+ VersioningFactory.eINSTANCE.createChangePackageProxy()));
+
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT_SPACE__MERGED_VERSION,
+ VersioningFactory.eINSTANCE.createPrimaryVersionSpec()));
}
/**
@@ -455,12 +425,10 @@
final Object childFeature = feature;
final Object childObject = child;
- final boolean qualify =
- childFeature == ModelPackage.Literals.PROJECT_SPACE__BASE_VERSION ||
- childFeature == ModelPackage.Literals.PROJECT_SPACE__MERGED_VERSION;
+ final boolean qualify = childFeature == ModelPackage.Literals.PROJECT_SPACE__BASE_VERSION ||
+ childFeature == ModelPackage.Literals.PROJECT_SPACE__MERGED_VERSION;
- if (qualify)
- {
+ if (qualify) {
return getString("_UI_CreateChild_text2", //$NON-NLS-1$
new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ServerInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ServerInfoItemProvider.java
index f85bcbc..ddd1f7e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ServerInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/ServerInfoItemProvider.java
@@ -57,8 +57,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addNamePropertyDescriptor(object);
@@ -79,9 +78,8 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ServerInfo_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_ServerInfo_name_feature", "_UI_ServerInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -102,9 +100,8 @@
* @generated
*/
protected void addUrlPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ServerInfo_url_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_ServerInfo_url_feature", "_UI_ServerInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -125,9 +122,8 @@
* @generated
*/
protected void addPortPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ServerInfo_port_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_ServerInfo_port_feature", "_UI_ServerInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -144,13 +140,12 @@
* This adds a property descriptor for the Path feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
- protected void addPathPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addPathPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ServerInfo_path_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_ServerInfo_path_feature", "_UI_ServerInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -171,13 +166,11 @@
*/
protected void addLastUsersessionPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ServerInfo_lastUsersession_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ServerInfo_lastUsersession_feature", "_UI_ServerInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ServerInfo_lastUsersession_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ServerInfo_type"), //$NON-NLS-1$
ModelPackage.Literals.SERVER_INFO__LAST_USERSESSION,
true,
false,
@@ -195,13 +188,11 @@
*/
protected void addCertificateAliasPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ServerInfo_certificateAlias_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ServerInfo_certificateAlias_feature", "_UI_ServerInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_ServerInfo_certificateAlias_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_ServerInfo_type"), //$NON-NLS-1$
ModelPackage.Literals.SERVER_INFO__CERTIFICATE_ALIAS,
true,
false,
@@ -221,8 +212,7 @@
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null)
- {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ModelPackage.Literals.SERVER_INFO__PROJECT_INFOS);
}
@@ -263,8 +253,7 @@
@Override
public String getText(Object object) {
final String label = ((ServerInfo) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_ServerInfo_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_ServerInfo_type") : //$NON-NLS-1$
getString("_UI_ServerInfo_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -280,8 +269,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(ServerInfo.class))
- {
+ switch (notification.getFeatureID(ServerInfo.class)) {
case ModelPackage.SERVER_INFO__NAME:
case ModelPackage.SERVER_INFO__URL:
case ModelPackage.SERVER_INFO__PORT:
@@ -307,10 +295,8 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.SERVER_INFO__PROJECT_INFOS,
- ModelFactory.eINSTANCE.createProjectInfo()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.SERVER_INFO__PROJECT_INFOS,
+ ModelFactory.eINSTANCE.createProjectInfo()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/UsersessionItemProvider.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/UsersessionItemProvider.java
index f4f7959..3e0e70e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/UsersessionItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/UsersessionItemProvider.java
@@ -58,8 +58,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addUsernamePropertyDescriptor(object);
@@ -79,13 +78,12 @@
* @generated
*/
protected void addUsernamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Usersession_username_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Usersession_username_feature", "_UI_Usersession_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Usersession_username_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_Usersession_type"), //$NON-NLS-1$
ModelPackage.Literals.USERSESSION__USERNAME,
true,
false,
@@ -102,13 +100,12 @@
* @generated
*/
protected void addPasswordPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Usersession_password_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Usersession_password_feature", "_UI_Usersession_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Usersession_password_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_Usersession_type"), //$NON-NLS-1$
ModelPackage.Literals.USERSESSION__PASSWORD,
true,
false,
@@ -125,13 +122,12 @@
* @generated
*/
protected void addSessionIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Usersession_sessionId_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Usersession_sessionId_feature", "_UI_Usersession_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Usersession_sessionId_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_Usersession_type"), //$NON-NLS-1$
ModelPackage.Literals.USERSESSION__SESSION_ID,
true,
false,
@@ -149,13 +145,11 @@
*/
protected void addPersistentPasswordPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Usersession_persistentPassword_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Usersession_persistentPassword_feature", "_UI_Usersession_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Usersession_persistentPassword_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_Usersession_type"), //$NON-NLS-1$
ModelPackage.Literals.USERSESSION__PERSISTENT_PASSWORD,
true,
false,
@@ -173,13 +167,11 @@
*/
protected void addServerInfoPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Usersession_serverInfo_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Usersession_serverInfo_feature", "_UI_Usersession_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Usersession_serverInfo_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_Usersession_type"), //$NON-NLS-1$
ModelPackage.Literals.USERSESSION__SERVER_INFO,
true,
false,
@@ -197,13 +189,11 @@
*/
protected void addSavePasswordPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Usersession_savePassword_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Usersession_savePassword_feature", "_UI_Usersession_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Usersession_savePassword_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_Usersession_type"), //$NON-NLS-1$
ModelPackage.Literals.USERSESSION__SAVE_PASSWORD,
true,
false,
@@ -224,8 +214,7 @@
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null)
- {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ModelPackage.Literals.USERSESSION__AC_USER);
childrenFeatures.add(ModelPackage.Literals.USERSESSION__CHANGED_PROPERTIES);
@@ -282,8 +271,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Usersession.class))
- {
+ switch (notification.getFeatureID(Usersession.class)) {
case ModelPackage.USERSESSION__USERNAME:
case ModelPackage.USERSESSION__PASSWORD:
case ModelPackage.USERSESSION__PERSISTENT_PASSWORD:
@@ -309,15 +297,11 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.USERSESSION__AC_USER,
- AccesscontrolFactory.eINSTANCE.createACUser()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.USERSESSION__AC_USER,
+ AccesscontrolFactory.eINSTANCE.createACUser()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.USERSESSION__CHANGED_PROPERTIES,
- AccesscontrolFactory.eINSTANCE.createOrgUnitProperty()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.USERSESSION__CHANGED_PROPERTIES,
+ AccesscontrolFactory.eINSTANCE.createOrgUnitProperty()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/WorkspaceItemProvider.java b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/WorkspaceItemProvider.java
index 54ca033..0a1aa5d 100644
--- a/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/WorkspaceItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.model.edit/src/org/eclipse/emf/emfstore/internal/client/model/provider/WorkspaceItemProvider.java
@@ -54,8 +54,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
@@ -73,8 +72,7 @@
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null)
- {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ModelPackage.Literals.WORKSPACE__PROJECT_SPACES);
childrenFeatures.add(ModelPackage.Literals.WORKSPACE__SERVER_INFOS);
@@ -129,8 +127,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Workspace.class))
- {
+ switch (notification.getFeatureID(Workspace.class)) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
case ModelPackage.WORKSPACE__SERVER_INFOS:
case ModelPackage.WORKSPACE__USERSESSIONS:
@@ -151,20 +148,14 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.WORKSPACE__PROJECT_SPACES,
- ModelFactory.eINSTANCE.createProjectSpace()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.WORKSPACE__PROJECT_SPACES,
+ ModelFactory.eINSTANCE.createProjectSpace()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.WORKSPACE__SERVER_INFOS,
- ModelFactory.eINSTANCE.createServerInfo()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.WORKSPACE__SERVER_INFOS,
+ ModelFactory.eINSTANCE.createServerInfo()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.WORKSPACE__USERSESSIONS,
- ModelFactory.eINSTANCE.createUsersession()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.WORKSPACE__USERSESSIONS,
+ ModelFactory.eINSTANCE.createUsersession()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
index dd009c7..b9cbe62 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Transaction
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.transaction;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.transaction;bundle-version="[1.6.0,2.0.0)";visibility:=reexport
Export-Package: org.eclipse.emf.emfstore.internal.client.transaction;v
- ersion="1.8.1";x-internal:=true
+ ersion="1.9.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml b/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
index b83bc42..df8bc5b 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.transaction</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/internal/client/transaction/EMFStoreTransactionalCommandStack.java b/bundles/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/internal/client/transaction/EMFStoreTransactionalCommandStack.java
index abb67c8..7c9d318 100644
--- a/bundles/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/internal/client/transaction/EMFStoreTransactionalCommandStack.java
+++ b/bundles/org.eclipse.emf.emfstore.client.transaction/src/org/eclipse/emf/emfstore/internal/client/transaction/EMFStoreTransactionalCommandStack.java
@@ -88,8 +88,7 @@
private void redoOfBasicCommandStack() {
final Command command = commandList.get(++top);
- try
- {
+ try {
command.redo();
mostRecentCommand = command;
// BEGIN SUPRESS CATCH EXCEPTION
@@ -103,8 +102,7 @@
// Clear the list past the top.
//
for (final Iterator<Command> commands = commandList.listIterator(top--); commands.hasNext(); commands
- .remove())
- {
+ .remove()) {
final Command otherCommand = commands.next();
otherCommand.dispose();
}
@@ -115,8 +113,7 @@
private void undoOfBasicCommandStack() {
final Command command = commandList.get(top--);
- try
- {
+ try {
command.undo();
mostRecentCommand = command;
// BEGIN SUPRESS CATCH EXCEPTION
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
index 22d8a7d..dacba55 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: HistoryBrowserComparator
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.historybrowsercomparator;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.emf.compare;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
org.eclipse.compare;bundle-version="[3.5.300,4.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.client.ui;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.client.ui;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.compare.ide.ui;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.compare.ide;bundle-version="[3.1.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.compare.edit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -16,4 +16,4 @@
org.eclipse.jface;bundle-version="[3.8.0,4.0.0)",
org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)"
Export-Package: org.eclipse.emf.emfstore.client.ui.historybrowsercompa
- rator;version="1.8.1";x-internal:=true
+ rator;version="1.9.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
index 1c9ddae..68a08f9 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.historybrowsercomparator</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
index a76f02a..0d36936 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client UI for RAP
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.rap
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.emfstore.internal.client.ui.dialogs.lo
- gin;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.interna
- l.client.ui.dialogs.merge.ui;version="1.8.1";x-internal:=true,org.ecl
- ipse.emf.emfstore.internal.client.ui.util;version="1.8.1";x-friends:=
+ gin;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.interna
+ l.client.ui.dialogs.merge.ui;version="1.9.0";x-internal:=true,org.ecl
+ ipse.emf.emfstore.internal.client.ui.util;version="1.9.0";x-friends:=
"org.eclipse.emf.emfstore.client.ui"
Bundle-Vendor: Eclipse Modeling Project
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
index 36722ff..5d9c0dc 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.rap</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java b/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java
index 251156c..0b6d98c 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -15,7 +15,7 @@
/**
* RAP UI related messages.
- *
+ *
* @author Edgar
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java b/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java
index 5c53bb9..b09c9d7 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rap/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Johannes Faltermeier - initial API and implementation
******************************************************************************/
@@ -19,18 +19,18 @@
/**
* {@link EMFStoreFileDialogHelper} using the RWT implementation of the {@link FileDialog}.
- *
+ *
* @author jfaltermeier
- *
+ *
*/
public class EMFStoreFileDialogHelperImpl implements EMFStoreFileDialogHelper {
private static final String IMPORT_MODEL_PATH = "org.eclipse.emf.emfstore.client.ui.importModelPath"; //$NON-NLS-1$
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.ui.util.EMFStoreFileDialogHelper#getPathForImport(org.eclipse.swt.widgets.Shell)
*/
public String getPathForImport(Shell shell) {
@@ -45,9 +45,9 @@
}
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.ui.util.EMFStoreFileDialogHelper#getPathForExport(org.eclipse.swt.widgets.Shell,
* java.lang.String)
*/
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
index e156738..f217907 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client UI for RCP
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.rcp
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emf.emfstore.internal.client.ui.dialogs.lo
- gin;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.interna
- l.client.ui.dialogs.merge.ui;version="1.8.1";x-internal:=true,org.ecl
+ gin;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.interna
+ l.client.ui.dialogs.merge.ui;version="1.9.0";x-internal:=true,org.ecl
ipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.components;vers
- ion="1.8.1";x-friends:="org.eclipse.emf.emfstore.client.ui",org.eclip
- se.emf.emfstore.internal.client.ui.util;version="1.8.1";x-friends:="o
+ ion="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui",org.eclip
+ se.emf.emfstore.internal.client.ui.util;version="1.9.0";x-friends:="o
rg.eclipse.emf.emfstore.client.ui"
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
index 6710552..80ae402 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.rcp</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/DescriptionComponentImpl.java b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/DescriptionComponentImpl.java
index 931421f..ccacc0f 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/DescriptionComponentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/DescriptionComponentImpl.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Otto von Wesendonk - initial API and implementation
******************************************************************************/
@@ -28,7 +28,7 @@
/**
* Displays the description in the decision box.
- *
+ *
* @author wesendon
*/
public class DescriptionComponentImpl implements DescriptionComponent {
@@ -40,9 +40,9 @@
}
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.MergeComponent#init(org.eclipse.swt.widgets.Composite,
* org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge.ui.DecisionBox,
* org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.VisualConflict)
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java
index 523b8f5..b454dad 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/Messages.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/OptionComponentImpl.java b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/OptionComponentImpl.java
index eabe4dc..1ba97d9 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/OptionComponentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/ui/OptionComponentImpl.java
@@ -86,12 +86,12 @@
case MyOperation:
result = dBox.getDecisionManager().isBranchMerge() ? Messages.OptionComponentImpl_IncomingBranch
: Messages.OptionComponentImpl_KeepMyChange + countInfo
- + ": "; //$NON-NLS-1$
+ + ": "; //$NON-NLS-1$
break;
case TheirOperation:
result = dBox.getDecisionManager().isBranchMerge() ? Messages.OptionComponentImpl_CurrentBranch
: Messages.OptionComponentImpl_KeepTheirChange + countInfo
- + ": "; //$NON-NLS-1$
+ + ": "; //$NON-NLS-1$
break;
case Custom:
if (option instanceof CustomConflictOption) {
@@ -185,7 +185,8 @@
detailsButton.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- final DetailsDialog detailsDialog = new DetailsDialog(getShell(), dBox.getDecisionManager(), option);
+ final DetailsDialog detailsDialog = new DetailsDialog(getShell(), dBox.getDecisionManager(),
+ option);
detailsDialog.open();
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java
index 278af42..574b747 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.rcp/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreFileDialogHelperImpl.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Johannes Faltermeier - initial API and implementation
******************************************************************************/
@@ -13,17 +13,15 @@
import java.io.File;
-import org.eclipse.emf.emfstore.internal.client.ui.util.EMFStoreFileDialogHelper;
-import org.eclipse.emf.emfstore.internal.client.ui.util.EMFStorePreferenceHelper;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
/**
* {@link EMFStoreFileDialogHelper} using the SWT implementation of the {@link FileDialog}.
- *
+ *
* @author jfaltermeier
- *
+ *
*/
public class EMFStoreFileDialogHelperImpl implements EMFStoreFileDialogHelper {
@@ -32,9 +30,9 @@
private static final String FILE_EXTENSION = "xmi"; //$NON-NLS-1$
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.ui.util.EMFStoreFileDialogHelper#getPathForImport(org.eclipse.swt.widgets.Shell)
*/
public String getPathForImport(Shell shell) {
@@ -60,9 +58,9 @@
}
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.ui.util.EMFStoreFileDialogHelper#getPathForExport(org.eclipse.swt.widgets.Shell,
* java.lang.String)
*/
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
index c388444..01a9df9 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Transaction UI
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.transaction;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.emf.transaction;bundle-version="[1.6.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)"
Export-Package: org.eclipse.emf.emfstore.internal.client.ui.transactio
- n;version="1.8.1";x-internal:=true
+ n;version="1.9.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
index 3b0f035..c18876f 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui.transaction/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.transaction</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
index 2267de6..8ae4958 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/META-INF/MANIFEST.MF
@@ -2,60 +2,60 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client UI
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: org.eclipse.emf.emfstore.internal.client.ui.Activator
Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.emfstore.server.model
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Bundle-ClassPath: .,
lib/dmp.jar
-Export-Package: org.eclipse.emf.emfstore.client.ui;version="1.8.1"; us
+Export-Package: org.eclipse.emf.emfstore.client.ui;version="1.9.0"; us
es:="org.eclipse.emf.ecore, org.eclipse.emf.emfstore.client, org.ec
lipse.swt.widgets, org.eclipse.emf.emfstore.server.model.versionspec
- ",org.eclipse.emf.emfstore.internal.client.ui;version="1.8.1";x-inter
+ ",org.eclipse.emf.emfstore.internal.client.ui;version="1.9.0";x-inter
nal:=true,org.eclipse.emf.emfstore.internal.client.ui.common;version=
- "1.8.1";x-friends:="org.eclipse.emf.emfstore.client.test.ui,org.eclip
+ "1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test.ui,org.eclip
se.emf.ecp.emfstore.ui",org.eclipse.emf.emfstore.internal.client.ui.c
- ontroller;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.client
+ ontroller;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client
.test.ui,org.eclipse.emf.ecp.emfstore.ui",org.eclipse.emf.emfstore.in
- ternal.client.ui.decorators;version="1.8.1";x-internal:=true,org.ecli
- pse.emf.emfstore.internal.client.ui.dialogs;version="1.8.1";x-interna
+ ternal.client.ui.decorators;version="1.9.0";x-internal:=true,org.ecli
+ pse.emf.emfstore.internal.client.ui.dialogs;version="1.9.0";x-interna
l:=true,org.eclipse.emf.emfstore.internal.client.ui.dialogs.admin;ver
- sion="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
- t.ui.dialogs.admin.acimport;version="1.8.1";x-internal:=true,org.ecli
+ sion="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
+ t.ui.dialogs.admin.acimport;version="1.9.0";x-internal:=true,org.ecli
pse.emf.emfstore.internal.client.ui.dialogs.admin.acimport.wizard;ver
- sion="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
- t.ui.dialogs.admin.action;version="1.8.1";x-internal:=true,org.eclips
- e.emf.emfstore.internal.client.ui.dialogs.login;version="1.8.1";x-int
+ sion="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.clien
+ t.ui.dialogs.admin.action;version="1.9.0";x-internal:=true,org.eclips
+ e.emf.emfstore.internal.client.ui.dialogs.login;version="1.9.0";x-int
ernal:=true,org.eclipse.emf.emfstore.internal.client.ui.dialogs.merge
- ;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.c
- lient.ui.dialogs.merge.ui;version="1.8.1";x-internal:=true,org.eclips
+ ;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.c
+ lient.ui.dialogs.merge.ui;version="1.9.0";x-internal:=true,org.eclips
e.emf.emfstore.internal.client.ui.dialogs.merge.ui.components;version
- ="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui
- .dialogs.merge.ui.widgets;version="1.8.1";x-internal:=true,org.eclips
- e.emf.emfstore.internal.client.ui.dialogs.merge.util;version="1.8.1";
+ ="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui
+ .dialogs.merge.ui.widgets;version="1.9.0";x-internal:=true,org.eclips
+ e.emf.emfstore.internal.client.ui.dialogs.merge.util;version="1.9.0";
x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui.epackage
- s;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.
- client.ui.exceptions;version="1.8.1";x-internal:=true,org.eclipse.emf
- .emfstore.internal.client.ui.handlers;version="1.8.1";x-internal:=tru
+ s;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.
+ client.ui.exceptions;version="1.9.0";x-internal:=true,org.eclipse.emf
+ .emfstore.internal.client.ui.handlers;version="1.9.0";x-internal:=tru
e,org.eclipse.emf.emfstore.internal.client.ui.handlers.exportimport;v
- ersion="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.cli
- ent.ui.testers;version="1.8.1";x-internal:=true,org.eclipse.emf.emfst
- ore.internal.client.ui.util;version="1.8.1";x-internal:=true,org.ecli
- pse.emf.emfstore.internal.client.ui.views.changes;version="1.8.1";x-i
+ ersion="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.cli
+ ent.ui.testers;version="1.9.0";x-internal:=true,org.eclipse.emf.emfst
+ ore.internal.client.ui.util;version="1.9.0";x-internal:=true,org.ecli
+ pse.emf.emfstore.internal.client.ui.views.changes;version="1.9.0";x-i
nternal:=true,org.eclipse.emf.emfstore.internal.client.ui.views.emfst
- orebrowser.views;version="1.8.1";x-friends:="org.eclipse.emf.ecp.emfs
+ orebrowser.views;version="1.9.0";x-friends:="org.eclipse.emf.ecp.emfs
tore.ui",org.eclipse.emf.emfstore.internal.client.ui.views.historybro
- wserview;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.in
- ternal.client.ui.views.historybrowserview.graph;version="1.8.1";x-int
+ wserview;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.in
+ ternal.client.ui.views.historybrowserview.graph;version="1.9.0";x-int
ernal:=true,org.eclipse.emf.emfstore.internal.client.ui.views.scm;ver
- sion="1.8.1";x-internal:=true,org.eclipse.wb.swt;version="1.8.1";x-in
+ sion="1.9.0";x-internal:=true,org.eclipse.wb.swt;version="1.9.0";x-in
ternal:=true;uses:="org.eclipse.jface.resource,org.eclipse.swt.graphi
cs"
Import-Package: org.eclipse.core.commands;version="0.0.0",
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/plugin.xml b/bundles/org.eclipse.emf.emfstore.client.ui/plugin.xml
index 6fb2b9c..e78e263 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/plugin.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/plugin.xml
@@ -6,6 +6,7 @@
<extension-point id="historyBrowserComparator" name="HistoryBrowserComparator" schema="schema/historyBrowserComparator.exsd"/>
<extension-point id="showPasswordControls" name="Show password controls" schema="schema/showPasswordControls.exsd"/>
<extension-point id="uiRunnableProvider" name="UI Runnable Provider" schema="schema/uiRunnableProvider.exsd"/>
+ <extension-point id="enableLazyLoadingOfChangePackages" name="Enable lazy loading of change Packages" schema="schema/enableLazyLoadingOfChangePackages.exsd"/>
<extension
point="org.eclipse.ui.handlers">
<handler
@@ -464,6 +465,28 @@
</and>
</visibleWhen>
</command>
+ <command
+ commandId="org.eclipse.emf.emfstore.client.ui.historybrowserview.loadChangePackages"
+ label="Show details"
+ style="push"
+ tooltip="Show details about this revision">
+ <visibleWhen
+ checkEnabled="true">
+ <and>
+ <systemTest
+ property="org.eclipse.emf.emfstore.client.ui.enableLazyLoadingOfChangePackages"
+ value="true">
+ </systemTest>
+ <iterate
+ ifEmpty="false"
+ operator="and">
+ <instanceof
+ value="org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo">
+ </instanceof>
+ </iterate>
+ </and>
+ </visibleWhen>
+ </command>
</menuContribution>
<menuContribution
locationURI="popup:org.eclipse.emf.emfstore.client.ui.views.RepositoryView?after=org.eclipse.emf.emfstore.internal.client.ui.repositorybrowser.ManageOrgUnits">
@@ -730,6 +753,11 @@
name="CheckoutRevision">
</command>
<command
+ defaultHandler="org.eclipse.emf.emfstore.internal.client.ui.handlers.LoadChangePackagesHandler"
+ id="org.eclipse.emf.emfstore.client.ui.historybrowserview.loadChangePackages"
+ name="LoadChangePackages">
+ </command>
+ <command
defaultHandler="org.eclipse.emf.emfstore.internal.client.ui.handlers.AddTagHandler"
id="org.eclipse.emf.emfstore.client.ui.historybrowserview.addtag"
name="AddTag">
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml b/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
index b8f4379..77bbbfe 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/schema/enableLazyLoadingOfChangePackages.exsd b/bundles/org.eclipse.emf.emfstore.client.ui/schema/enableLazyLoadingOfChangePackages.exsd
new file mode 100644
index 0000000..1ff692c
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/schema/enableLazyLoadingOfChangePackages.exsd
@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="org.eclipse.emf.emfstore.client.ui" xmlns="http://www.w3.org/2001/XMLSchema">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="org.eclipse.emf.emfstore.client.ui" id="enableLazyLoadingOfChangePackages" name="Enable lazy loading of change Packages"/>
+ </appInfo>
+ <documentation>
+ Enable lazy loading of change packages in the History Browser View. If enabled the initial list will only show history info (commit message, date, ...) but no change details. Change details can be loaded via context menu on the history info for one or more history infos.
+
+Per default lazy loading is disabled.
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <annotation>
+ <appInfo>
+ <meta.element />
+ </appInfo>
+ </annotation>
+ <complexType>
+ <sequence>
+ <element ref="enablement"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="enablement">
+ <complexType>
+ <attribute name="enabled" type="boolean" use="default" value="false">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ 1.9.0
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiinfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="copyright"/>
+ </appInfo>
+ <documentation>
+ Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.<br/>
+
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+which accompanies this distribution, and is available at
+http://www.eclipse.org/legal/epl-v10.html
+ </documentation>
+ </annotation>
+
+</schema>
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICommitProjectController.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICommitProjectController.java
index bd32a7d..d77c5bc 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICommitProjectController.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICommitProjectController.java
@@ -186,8 +186,7 @@
final LogMessage logMessage = LogMessageFactory.INSTANCE.createLogMessage(
commitDialog.getLogText(),
- projectSpace.getUsersession().getUsername()
- );
+ projectSpace.getUsersession().getUsername());
changePackage.setLogMessage(logMessage.toAPI());
return null;
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICreateBranchController.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICreateBranchController.java
index 191c511..a10f28c 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICreateBranchController.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UICreateBranchController.java
@@ -54,8 +54,8 @@
*
*/
public class UICreateBranchController extends
-AbstractEMFStoreUIController<ESPrimaryVersionSpec> implements
-ESCommitCallback {
+ AbstractEMFStoreUIController<ESPrimaryVersionSpec> implements
+ ESCommitCallback {
private final ProjectSpace projectSpace;
private int dialogReturnValue;
@@ -131,7 +131,7 @@
.getBaseVersion().toAPI();
final ESPrimaryVersionSpec version = new UIUpdateProjectController(
getShell(), projectSpace)
- .executeSub(progressMonitor);
+ .executeSub(progressMonitor);
if (version.equals(baseVersion)) {
return false;
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIGenericExportImportController.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIGenericExportImportController.java
index 2e42ce2..efe8d7b 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIGenericExportImportController.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIGenericExportImportController.java
@@ -74,12 +74,6 @@
absoluteFilePath = FileDialogHelper.openImportDialog(shell);
}
- // if (controller.getParentFolderPropertyKey() != null) {
- // final String initialPath = EMFStorePreferenceHelper.getPreference(controller.getParentFolderPropertyKey(),
- // System.getProperty("user.home")); //$NON-NLS-1$
- // dialog.setFilterPath(initialPath);
- // }
-
if (absoluteFilePath == null) {
return null;
}
@@ -100,15 +94,14 @@
try {
new ExportImportControllerExecutor(file, progressMonitor).execute(controller);
- MessageDialog.openInformation(getShell(), controller.isExport() ?
- Messages.UIGenericExportImportController_ExportImport_Title_0 :
- Messages.UIGenericExportImportController_ExportImport_Title_1 +
- Messages.UIGenericExportImportController_ExportImport_Title_2,
+ MessageDialog.openInformation(getShell(),
+ controller.isExport() ? Messages.UIGenericExportImportController_ExportImport_Title_0
+ : Messages.UIGenericExportImportController_ExportImport_Title_1 +
+ Messages.UIGenericExportImportController_ExportImport_Title_2,
MessageFormat.format(Messages.UIGenericExportImportController_ExportImport_Message_0,
controller.getLabel(),
- controller.isExport() ?
- Messages.UIGenericExportImportController_ExportImport_Message_1 :
- Messages.UIGenericExportImportController_ExportImport_Message_2));
+ controller.isExport() ? Messages.UIGenericExportImportController_ExportImport_Message_1
+ : Messages.UIGenericExportImportController_ExportImport_Message_2));
} catch (final IOException e) {
EMFStoreMessageDialog.showExceptionDialog(getShell(), e);
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIUpdateProjectToVersionController.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIUpdateProjectToVersionController.java
index ea04b22..d0cbb59 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIUpdateProjectToVersionController.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/controller/UIUpdateProjectToVersionController.java
@@ -77,7 +77,7 @@
getShell(),
projectSpace,
ESVersionSpec.FACTORY.createHEAD(projectSpace.getBaseVersion()))
- .execute();
+ .execute();
}
});
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/decorators/VersionDecorator.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/decorators/VersionDecorator.java
index 34a542a..6051533 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/decorators/VersionDecorator.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/decorators/VersionDecorator.java
@@ -145,7 +145,8 @@
*
* {@inheritDoc}
*/
- public boolean inspectChanges(ESLocalProject project, List<ESChangePackage> changePackages, IProgressMonitor monitor) {
+ public boolean inspectChanges(ESLocalProject project, List<ESChangePackage> changePackages,
+ IProgressMonitor monitor) {
return true;
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/UpdateDialog.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/UpdateDialog.java
index 70115d7..813c43f 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/UpdateDialog.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/UpdateDialog.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Zardosht Hoiaie
* Edgar Mueller
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/util/UIDecisionUtil.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/util/UIDecisionUtil.java
index ce9028b..0502e27 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/util/UIDecisionUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/dialogs/merge/util/UIDecisionUtil.java
@@ -122,7 +122,8 @@
*
* @return visualizationhelper
*/
- public static ChangePackageVisualizationHelper getChangePackageVisualizationHelper(DecisionManager decisionManager) {
+ public static ChangePackageVisualizationHelper getChangePackageVisualizationHelper(
+ DecisionManager decisionManager) {
return new ChangePackageVisualizationHelper(decisionManager.getIdToEObjectMapping());
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/CompareRevisionsHandler.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/CompareRevisionsHandler.java
index 7ebb1dd..53c652a 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/CompareRevisionsHandler.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/CompareRevisionsHandler.java
@@ -37,7 +37,7 @@
new UICompareRevisionsController(getShell(), list.get(0).getPrimarySpec().toAPI(),
list.get(1).getPrimarySpec().toAPI(), view.getProjectSpace().toAPI())
- .execute();
+ .execute();
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/LoadChangePackagesHandler.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/LoadChangePackagesHandler.java
new file mode 100644
index 0000000..1387521
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/handlers/LoadChangePackagesHandler.java
@@ -0,0 +1,135 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Metus GmbH
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * mbarchfe
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.internal.client.ui.handlers;
+
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
+import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
+import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ConnectionManager;
+import org.eclipse.emf.emfstore.internal.client.ui.views.historybrowserview.HistoryBrowserView;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
+import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
+import org.eclipse.emf.emfstore.internal.server.model.SessionId;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec;
+import org.eclipse.emf.emfstore.server.exceptions.ESException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+/**
+ * Handler for getting a list of change packages for given {@link HistoryInfo}s .
+ *
+ * @author mbarchfe
+ *
+ */
+public class LoadChangePackagesHandler extends AbstractEMFStoreHandler {
+
+ /**
+ * Gets the selection from an {@link ExecutionEvent}. Only elements which are instances of the given class will be
+ * returned.
+ *
+ * @param event the event
+ * @param clazz the type
+ * @return the selection
+ *
+ * @param <T> the type
+ */
+ @SuppressWarnings("unchecked")
+ public static <T> List<T> getSelection(ExecutionEvent event, Class<T> clazz) {
+ final List<T> result = new ArrayList<T>();
+ ISelection sel = HandlerUtil.getCurrentSelection(event);
+ if (sel == null) {
+ sel = HandlerUtil.getActiveMenuSelection(event);
+ }
+ if (sel instanceof IStructuredSelection) {
+ final IStructuredSelection structuredSelection = (IStructuredSelection) sel;
+ @SuppressWarnings("rawtypes")
+ final Iterator it = structuredSelection.iterator();
+ while (it.hasNext()) {
+ final Object selectedElement = it.next();
+ if (clazz.isInstance(selectedElement)) {
+ result.add((T) selectedElement);
+ }
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public void handle() {
+
+ final IWorkbenchWindow activeWorkbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ final IWorkbenchPage activePage = activeWorkbenchWindow.getActivePage();
+ if (activePage == null) {
+ return;
+ }
+
+ if (!(activePage.getActivePart() instanceof HistoryBrowserView)) {
+ return;
+ }
+
+ final HistoryBrowserView view = (HistoryBrowserView) activePage.getActivePart();
+ final ProjectSpace projectSpace = view.getProjectSpace();
+ final ESWorkspaceProviderImpl esWorkspaceProviderImpl = ESWorkspaceProviderImpl.getInstance();
+
+ final ConnectionManager connectionManager = esWorkspaceProviderImpl.getConnectionManager();
+
+ final ProjectId projectId = projectSpace.getProjectId();
+ final SessionId sessionId = projectSpace.getUsersession().getSessionId();
+
+ final List<HistoryInfo> historyInfos = getSelection(getEvent(), HistoryInfo.class);
+ for (final HistoryInfo historyInfo : historyInfos) {
+ final PrimaryVersionSpec fromSpec = ModelUtil.clone(historyInfo.getPreviousSpec());
+ final PrimaryVersionSpec toSpec = ModelUtil.clone(historyInfo.getPrimarySpec());
+ // e.g. local change would be invalid to send to server
+ if (!isValid(fromSpec) || !isValid(toSpec)) {
+ continue;
+ }
+
+ try {
+ final List<AbstractChangePackage> changes = connectionManager.getChanges(sessionId, projectId,
+ fromSpec,
+ toSpec);
+ // the result should be one change package, if there were more or none this would be suprising
+ if (changes.size() != 1) {
+ ModelUtil.log(
+ MessageFormat.format("Expected to retrieve one change package but got {0}", changes.size()), //$NON-NLS-1$
+ null, IStatus.ERROR);
+ } else {
+ historyInfo.setChangePackage(changes.get(0));
+ }
+ } catch (final ESException ex) {
+ ModelUtil.log(
+ MessageFormat.format("Could not load changes for history info {0}", historyInfo), //$NON-NLS-1$
+ ex, IStatus.ERROR);
+ }
+ view.refresh(historyInfo);
+ }
+
+ }
+
+ private boolean isValid(PrimaryVersionSpec spec) {
+ return spec != null && spec.getIdentifier() > -1;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreHandlerUtil.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreHandlerUtil.java
index 721aacb..f12ad4e 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreHandlerUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/util/EMFStoreHandlerUtil.java
@@ -43,6 +43,9 @@
*/
@SuppressWarnings("unchecked")
public static <T> T getSelection(ExecutionEvent event, Class<T> clazz) {
+ if (event == null) {
+ return null;
+ }
ISelection sel = HandlerUtil.getCurrentSelection(event);
if (sel == null) {
sel = HandlerUtil.getActiveMenuSelection(event);
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/changes/TabbedChangesComposite.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/changes/TabbedChangesComposite.java
index b5ca126..29e4b9a 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/changes/TabbedChangesComposite.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/changes/TabbedChangesComposite.java
@@ -106,7 +106,7 @@
GridLayoutFactory.fillDefaults().applyTo(tabComposite);
tabTreeViewer = new TreeViewer(tabComposite, SWT.H_SCROLL
- | SWT.V_SCROLL);
+ | SWT.V_SCROLL | SWT.VIRTUAL);
GridDataFactory.fillDefaults().grab(true, true)
.applyTo(tabTreeViewer.getControl());
@@ -115,6 +115,7 @@
labelProvider = new SCMLabelProvider(project);
labelProvider.setChangePackageVisualizationHelper(
new ChangePackageVisualizationHelper(idToEObjectMapping));
+ contentProvider.setProxyInitializer(labelProvider);
tabTreeViewer.setContentProvider(contentProvider);
tabTreeViewer.setLabelProvider(labelProvider);
tabTreeViewer.expandToLevel(1);
@@ -126,7 +127,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.swt.widgets.Widget#dispose()
*/
@Override
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java
index 663fd1e..14b3dfd 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/emfstorebrowser/views/CertificateSelectionDialog.java
@@ -180,7 +180,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
*/
public void widgetDefaultSelected(SelectionEvent e) {
@@ -190,7 +190,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
*/
public void widgetSelected(SelectionEvent e) {
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/CommitInfoColumnLabelProvider.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/CommitInfoColumnLabelProvider.java
index 80e64a0..562123d 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/CommitInfoColumnLabelProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/CommitInfoColumnLabelProvider.java
@@ -32,7 +32,8 @@
final StringBuilder builder = new StringBuilder();
if (historyInfo.getLogMessage() != null) {
logMessage = historyInfo.getLogMessage();
- } else if (historyInfo.getChangePackage() != null && historyInfo.getChangePackage().getLogMessage() != null) {
+ } else if (historyInfo.getChangePackage() != null
+ && historyInfo.getChangePackage().getLogMessage() != null) {
logMessage = historyInfo.getChangePackage().getLogMessage();
}
if (logMessage != null) {
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/HistoryBrowserView.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/HistoryBrowserView.java
index bedac2a..8f65050 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/HistoryBrowserView.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/HistoryBrowserView.java
@@ -26,6 +26,8 @@
import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.emf.emfstore.client.ESLocalProject;
import org.eclipse.emf.emfstore.client.util.ESVoidCallable;
+import org.eclipse.emf.emfstore.common.extensionpoint.ESExtensionPoint;
+import org.eclipse.emf.emfstore.common.extensionpoint.ESExtensionPointException;
import org.eclipse.emf.emfstore.internal.client.common.UnknownEMFStoreWorkloadCommand;
import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
@@ -149,6 +151,25 @@
private boolean isUnlinkedFromNavigator;
private Action showAllBranches;
+ // changes can be transferred with historyInfos. However, this must be avoided if the server sends
+ // FileBasedChangePackages which the client can not open
+ private final static Boolean isLazyLoadingChanges;
+ private static final String ENABLE_LAZY_LOADING_OF_CHANGE_PACKAGES_EXTENSION_POINT = "org.eclipse.emf.emfstore.client.ui.enableLazyLoadingOfChangePackages"; //$NON-NLS-1$
+
+ static {
+ Boolean result;
+ try {
+ result = new ESExtensionPoint(ENABLE_LAZY_LOADING_OF_CHANGE_PACKAGES_EXTENSION_POINT, true)
+ .getBoolean("enabled", false); //$NON-NLS-1$
+ // set system property to be in sync with extension point and to be queryable for menu point enablement
+ System.setProperty(ENABLE_LAZY_LOADING_OF_CHANGE_PACKAGES_EXTENSION_POINT, result.toString()); // $NON-NLS-1$
+ } catch (final ESExtensionPointException e) {
+ // if no extension is available, check for system property
+ result = Boolean.getBoolean(ENABLE_LAZY_LOADING_OF_CHANGE_PACKAGES_EXTENSION_POINT); // $NON-NLS-1$
+ }
+ isLazyLoadingChanges = result;
+ }
+
/**
* {@inheritDoc}
*/
@@ -158,6 +179,7 @@
@Override
public void createPartControl(Composite parent) {
+
GridLayoutFactory.fillDefaults().applyTo(parent);
initNoProjectHint(parent);
@@ -288,6 +310,15 @@
viewer.setInput(infos);
}
+ /**
+ * Refresh a history info. Useful if a change package has been loaded lazily.
+ *
+ * @param historyInfo the {@link HistoryInfo} to refresh
+ */
+ public void refresh(HistoryInfo historyInfo) {
+ viewer.refresh(historyInfo);
+ }
+
private void addBaseVersionTag(List<HistoryInfo> infos) {
final HistoryInfo historyInfo = getHistoryInfo(projectSpace.getBaseVersion());
if (historyInfo != null) {
@@ -373,7 +404,7 @@
UPPER_LIMIT,
LOWER_LIMIT,
showAllVersions,
- true);
+ !isLazyLoadingChanges);
// TODO: proivde util method
final ESHistoryQuery<ESModelElementQuery> api = query.toAPI();
final List<ESHistoryInfo> infos = projectSpace.toAPI().getHistoryInfos(api, new NullProgressMonitor());
@@ -386,7 +417,7 @@
centerVersion,
UPPER_LIMIT,
LOWER_LIMIT,
- showAllVersions, true, true, true);
+ showAllVersions, true, true, !isLazyLoadingChanges);
final List<ESHistoryInfo> infos = projectSpace.toAPI().getHistoryInfos(
rangeQuery.toAPI(),
new NullProgressMonitor());
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/LogMessageColumnLabelProvider.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/LogMessageColumnLabelProvider.java
index c854577..c527636 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/LogMessageColumnLabelProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/LogMessageColumnLabelProvider.java
@@ -47,7 +47,8 @@
builder.append(""); //$NON-NLS-1$
} else if (historyInfo.getLogMessage() != null) {
logMessage = historyInfo.getLogMessage();
- } else if (historyInfo.getChangePackage() != null && historyInfo.getChangePackage().getLogMessage() != null) {
+ } else if (historyInfo.getChangePackage() != null
+ && historyInfo.getChangePackage().getLogMessage() != null) {
logMessage = historyInfo.getChangePackage().getLogMessage();
}
if (logMessage != null) {
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/PaginationManager.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/PaginationManager.java
index d3b2c3f..b0a1a84 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/PaginationManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/PaginationManager.java
@@ -75,7 +75,8 @@
* @param belowCenterCount
* The number of versions shown below the central version.
*/
- public PaginationManager(ProjectSpace projectSpace, EObject modelElement, int aboveCenterCount, int belowCenterCount) {
+ public PaginationManager(ProjectSpace projectSpace, EObject modelElement, int aboveCenterCount,
+ int belowCenterCount) {
this.aboveCenterCount = aboveCenterCount;
this.belowCenterCount = belowCenterCount;
this.projectSpace = projectSpace;
@@ -406,8 +407,7 @@
}
final HistoryQuery<ESHistoryQuery> query = getQuery(Versions.createPRIMARY(projectSpace.getBaseVersion(), id),
- aboveCenterCount
- + belowCenterCount, aboveCenterCount + belowCenterCount);
+ aboveCenterCount + belowCenterCount, aboveCenterCount + belowCenterCount);
// TODO: monitor
final List<ESHistoryInfo> infos = projectSpace.toAPI().getHistoryInfos(query.toAPI(),
new NullProgressMonitor());
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/graph/SWTPlotRenderer.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/graph/SWTPlotRenderer.java
index 9517c0c..8718a29 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/graph/SWTPlotRenderer.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/historybrowserview/graph/SWTPlotRenderer.java
@@ -141,14 +141,15 @@
// try {
// commit.parseBody();
// } catch (IOException e) {
- // Activator.error("Error parsing body", e); //$NON-NLS-1$
+ // Activator.error("Error parsing body", e); //$NON-NLS-1$
// return;
// }
paintCommit(representer, event.height);
}
@Override
- protected void drawLine(final Color color, final int x1, final int y1, final int x2, final int y2, final int width) {
+ protected void drawLine(final Color color, final int x1, final int y1, final int x2, final int y2,
+ final int width) {
g.setForeground(color);
g.setLineWidth(width);
g.drawLine(cellX + x1, cellY + y1, cellX + x2, cellY + y2);
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/ProxyInitializer.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/ProxyInitializer.java
new file mode 100644
index 0000000..5c179ce
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/ProxyInitializer.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.internal.client.ui.views.scm;
+
+import org.eclipse.emf.emfstore.internal.server.model.versioning.OperationProxy;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation;
+
+/**
+ * Implementors of this interface may be passed to a {@link SCMContentProvider}. The content provider will use this
+ * initializer to init newly created {@link OperationProxy operation proxies}.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public interface ProxyInitializer {
+
+ /**
+ * Initialises the given proxy.
+ *
+ * @param newProxy the newly created {@link OperationProxy proxy}
+ * @param operation the {@link AbstractOperation operation} which was used to create the proxy
+ */
+ void prepareProxy(OperationProxy newProxy, AbstractOperation operation);
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMContentProvider.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMContentProvider.java
index 989f7d5..c8c9df9 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMContentProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMContentProvider.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -45,6 +45,7 @@
private final Map<ChangePackage, VirtualNode<AbstractOperation>> changePackageToFilteredMapping;
private final Map<ChangePackage, List<Object>> changePackageToNonFilteredMapping;
private ModelElementIdToEObjectMapping idToEObjectMapping;
+ private ProxyInitializer proxyInitializer;
/**
* Default constructor.
@@ -195,6 +196,9 @@
if (object instanceof FileBasedChangePackage) {
return true;
}
+ if (object instanceof OperationProxy) {
+ return true;
+ }
return getChildren(object).length > 0;
}
@@ -242,6 +246,7 @@
}
private void createOperationProxies(final FileBasedChangePackage changePackage) {
+ // Performance Optimization: calculate label properties of proxies here if label provider was passed
final ESCloseableIterable<AbstractOperation> operations = changePackage.operations();
int opIndex = 0;
final List<OperationProxy> updatedProxies = new ArrayList<OperationProxy>();
@@ -249,6 +254,9 @@
for (final Iterator<AbstractOperation> iterator = operations.iterable().iterator(); iterator.hasNext();) {
final AbstractOperation operation = iterator.next();
final OperationProxy newProxy = createProxy(operation);
+ if (proxyInitializer != null) {
+ proxyInitializer.prepareProxy(newProxy, operation);
+ }
newProxy.setIndex(opIndex);
updatedProxies.add(newProxy);
@@ -294,4 +302,12 @@
this.showRootNodes = showRootNodes;
}
+ /**
+ * @param proxyInitializer the {@link ProxyInitializer}
+ */
+ public void setProxyInitializer(ProxyInitializer proxyInitializer) {
+ this.proxyInitializer = proxyInitializer;
+
+ }
+
}
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMLabelProvider.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMLabelProvider.java
index a5802b4..b1a35b3 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMLabelProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/emf/emfstore/internal/client/ui/views/scm/SCMLabelProvider.java
@@ -56,7 +56,7 @@
*
* @author Shterev
*/
-public class SCMLabelProvider extends ColumnLabelProvider {
+public class SCMLabelProvider extends ColumnLabelProvider implements ProxyInitializer {
private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd, HH:mm"); //$NON-NLS-1$
@@ -279,7 +279,14 @@
return result;
}
- private void prepareProxy(OperationProxy proxy, AbstractOperation operation) {
+ /**
+ *
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.internal.client.ui.views.scm.ProxyInitializer#prepareProxy(org.eclipse.emf.emfstore.internal.server.model.versioning.OperationProxy,
+ * org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation)
+ */
+ public void prepareProxy(OperationProxy proxy, AbstractOperation operation) {
final ImageData imageData = changePackageVisualizationHelper.getImage(adapterFactoryLabelProvider, operation)
.getImageData();
final ImageProxy imageProxy = ImageProxy.create().setWitdh(imageData.width).setHeight(imageData.height)
diff --git a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/SWTResourceManager.java b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
index 72c080e..2a44af9 100644
--- a/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client.ui/src/org/eclipse/wb/swt/SWTResourceManager.java
@@ -293,7 +293,8 @@
}
} catch (final Throwable e) {
System.err
- .println("Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
+ .println(
+ "Unable to set underline or strikeout" + " (probably on a non-Windows platform). " + e); //$NON-NLS-1$ //$NON-NLS-2$
}
}
font = new Font(Display.getCurrent(), fontData);
diff --git a/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
index 7403bf1..95d0cd0 100644
--- a/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.client/META-INF/MANIFEST.MF
@@ -2,110 +2,123 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client
Bundle-SymbolicName: org.eclipse.emf.emfstore.client;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.server;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.migration;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.server;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.migration;bundle-version="[1.9.0,2.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.emfstore.internal.client.model.Activator
Import-Package: org.apache.commons.codec.binary;version="1.3.0"
-Export-Package: org.eclipse.emf.emfstore.client;version="1.8.1",org.ec
- lipse.emf.emfstore.client.callbacks;version="1.8.1",org.eclipse.emf.e
- mfstore.client.changetracking;version="1.8.1",org.eclipse.emf.emfstor
- e.client.exceptions;version="1.8.1",org.eclipse.emf.emfstore.client.h
- andler;version="1.8.1",org.eclipse.emf.emfstore.client.observer;versi
- on="1.8.1",org.eclipse.emf.emfstore.client.provider;version="1.8.1",o
- rg.eclipse.emf.emfstore.client.sessionprovider;version="1.8.1",org.ec
- lipse.emf.emfstore.client.util;version="1.8.1",org.eclipse.emf.emfsto
- re.internal.client.accesscontrol;version="1.8.1";x-friends:="org.ecli
- pse.emf.emfstore.client.ui,org.eclipse.emf.ecp.emfstore.ui",org.eclip
- se.emf.emfstore.internal.client.common;version="1.8.1";x-friends:="or
- g.eclipse.emf.emfstore.client.ui",org.eclipse.emf.emfstore.internal.c
- lient.configuration;version="1.8.1"; x-friends:="org.eclipse.emf.emfs
- tore.client.ui, org.eclipse.emf.emfstore.fuzzy.emf.test, org.eclips
- e.emf.emfstore.server.test, org.eclipse.emf.ecp.emfstore.core, org.
- eclipse.emf.emfstore.client.test, org.eclipse.emf.emfstore.client.te
- st.ui",org.eclipse.emf.emfstore.internal.client.importexport;version=
- "1.8.1";x-friends:="org.eclipse.emf.emfstore.client.test,org.eclipse.
- emf.emfstore.client.ui,org.eclipse.emf.ecp.emfstore.ui",org.eclipse.e
- mf.emfstore.internal.client.importexport.impl;version="1.8.1";x-frien
- ds:="org.eclipse.emf.emfstore.client.test,org.eclipse.emf.ecp.emfstor
- e.ui",org.eclipse.emf.emfstore.internal.client.model;version="1.8.1";
- x-friends:="org.eclipse.emf.emfstore.client.model.edit, org.eclipse
- .emf.emfstore.client.test.ui, org.eclipse.emf.emfstore.client.transa
- ction, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.emfstore
- .example.merging, org.eclipse.emf.emfstore.fuzzy.emf.test, org.ecli
- pse.emf.emfstore.server.test, org.eclipse.emf.emfstore.test.common,
- org.eclipse.emf.emfstore.client.test, org.eclipse.emf.ecp.emfstore.
- core, org.eclipse.emf.ecp.emfstore.ui, org.eclipse.emf.ecp.emfstore
- .ui.e3, org.eclipse.emf.emfstore.performance.test, org.eclipse.emf.
- emfstore.fuzzy.emf, org.eclipse.emf.emfstore.client.ui.transaction,
- org.eclipse.emf.emfstore.client.ui.test",org.eclipse.emf.emfstore.in
- ternal.client.model.changeTracking;version="1.8.1";x-internal:=true,o
- rg.eclipse.emf.emfstore.internal.client.model.changeTracking.commands
- ;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.client.transact
- ion,org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfstore.in
- ternal.client.model.changeTracking.merging;version="1.8.1"; x-friends
- :="org.eclipse.emf.emfstore.client.test, org.eclipse.emf.emfstore.cl
- ient.ui, org.eclipse.emf.emfstore.example.merging, org.eclipse.emf.
- emfstore.test.common",org.eclipse.emf.emfstore.internal.client.model.
- changeTracking.merging.conflict;version="1.8.1";x-friends:="org.eclip
- se.emf.emfstore.client.test,org.eclipse.emf.emfstore.client.ui,org.ec
- lipse.emf.emfstore.test.common",org.eclipse.emf.emfstore.internal.cli
- ent.model.changeTracking.merging.conflict.conflicts;version="1.8.1";x
- -friends:="org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfs
- tore.internal.client.model.changeTracking.merging.conflict.options;ve
- rsion="1.8.1";x-friends:="org.eclipse.emf.emfstore.client.ui",org.ecl
- ipse.emf.emfstore.internal.client.model.changeTracking.merging.util;v
- ersion="1.8.1";x-friends:="org.eclipse.emf.emfstore.client.ui",org.ec
- lipse.emf.emfstore.internal.client.model.changeTracking.notification.
- filter;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.inte
- rnal.client.model.changeTracking.notification.recording;version="1.8.
- 1";x-friends:="org.eclipse.emf.emfstore.test.common",org.eclipse.emf.
- emfstore.internal.client.model.connectionmanager;version="1.8.1"; x-f
- riends:="org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.emfstor
- e.example.helloworld, org.eclipse.emf.emfstore.test.common, org.ecl
- ipse.emf.emfstore.server.test, org.eclipse.emf.ecp.emfstore.ui, org
- .eclipse.emf.emfstore.client.test.ui",org.eclipse.emf.emfstore.intern
- al.client.model.connectionmanager.xmlrpc;version="1.8.1";x-friends:="
- org.eclipse.emf.emfstore.test.common",org.eclipse.emf.emfstore.intern
- al.client.model.controller;version="1.8.1";x-friends:="org.eclipse.em
- f.emfstore.client.ui,org.eclipse.emf.emfstore.client.test,org.eclipse
- .emf.emfstore.example.merging",org.eclipse.emf.emfstore.internal.clie
- nt.model.exceptions;version="1.8.1"; x-friends:="org.eclipse.emf.emfs
- tore.client.test, org.eclipse.emf.emfstore.client.ui, org.eclipse.e
- mf.emfstore.test.common, org.eclipse.emf.emfstore.client.ui.test",or
- g.eclipse.emf.emfstore.internal.client.model.filetransfer;version="1.
- 8.1";x-friends:="org.eclipse.emf.emfstore.client.test",org.eclipse.em
- f.emfstore.internal.client.model.impl;version="1.8.1"; x-friends:="or
- g.eclipse.emf.emfstore.client.test, org.eclipse.emf.emfstore.client.
- ui, org.eclipse.emf.emfstore.fuzzy.emf.test, org.eclipse.emf.emfsto
- re.test.common, org.eclipse.emf.emfstore.server.test, org.eclipse.e
- mf.emfstore.client.test.ui, org.eclipse.emf.ecp.emfstore.core, org.
- eclipse.emf.ecp.emfstore.ui.e3",org.eclipse.emf.emfstore.internal.cli
- ent.model.impl.api;version="1.8.1"; x-friends:="org.eclipse.emf.emfst
- ore.client.ui, org.eclipse.emf.emfstore.example.merging, org.eclips
- e.emf.emfstore.fuzzy.emf.test, org.eclipse.emf.emfstore.server.test,
- org.eclipse.emf.emfstore.test.common, org.eclipse.emf.emfstore.cli
- ent.test, org.eclipse.emf.ecp.emfstore.core, org.eclipse.emf.ecp.em
- fstore.ui, org.eclipse.emf.ecp.emfstore.ui.e3, org.eclipse.emf.emfs
- tore.fuzzy.emf, org.eclipse.emf.emfstore.client.test.ui",org.eclipse
- .emf.emfstore.internal.client.model.util;version="1.8.1"; x-friends:=
- "org.eclipse.emf.emfstore.client.model.edit, org.eclipse.emf.emfstor
- e.client.transaction, org.eclipse.emf.emfstore.client.ui, org.eclip
- se.emf.emfstore.example.merging, org.eclipse.emf.emfstore.server.tes
- t, org.eclipse.emf.emfstore.test.common, org.eclipse.emf.ecp.emfsto
- re.core, org.eclipse.emf.ecp.emfstore.ui, org.eclipse.emf.emfstore.
- fuzzy.emf.test, org.eclipse.emf.emfstore.client.test, org.eclipse.e
- mf.emfstore.client.test.ui",org.eclipse.emf.emfstore.internal.client.
- observers;version="1.8.1"; x-friends:="org.eclipse.emf.emfstore.clien
- t.test, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.ecp.emf
- store.core, org.eclipse.emf.ecp.emfstore.ui.e3",org.eclipse.emf.emfs
- tore.internal.client.properties;version="1.8.1";x-friends:="org.eclip
- se.emf.emfstore.client.test",org.eclipse.emf.emfstore.internal.client
- .provider;version="1.0.2";x-internal:=true,org.eclipse.emf.emfstore.i
- nternal.client.startup;version="1.0.2";x-internal:=true
+Export-Package: org.eclipse.emf.emfstore.client;version="1.9.0",
+ org.eclipse.emf.emfstore.client.callbacks;version="1.9.0",
+ org.eclipse.emf.emfstore.client.changetracking;version="1.9.0",
+ org.eclipse.emf.emfstore.client.exceptions;version="1.9.0",
+ org.eclipse.emf.emfstore.client.handler;version="1.9.0",
+ org.eclipse.emf.emfstore.client.observer;version="1.9.0",
+ org.eclipse.emf.emfstore.client.provider;version="1.9.0",
+ org.eclipse.emf.emfstore.client.sessionprovider;version="1.9.0",
+ org.eclipse.emf.emfstore.client.util;version="1.9.0",
+ org.eclipse.emf.emfstore.internal.client.accesscontrol;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui,org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.emfstore.internal.client.common;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui",
+ org.eclipse.emf.emfstore.internal.client.configuration;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.test.ui",
+ org.eclipse.emf.emfstore.internal.client.importexport;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test,org.eclipse.emf.emfstore.client.ui,org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.emfstore.internal.client.importexport.impl;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test,org.eclipse.emf.ecp.emfstore.ui",
+ org.eclipse.emf.emfstore.internal.client.model;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.model.edit,
+ org.eclipse.emf.emfstore.client.test.ui,
+ org.eclipse.emf.emfstore.client.transaction,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.example.merging,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.ecp.emfstore.ui,
+ org.eclipse.emf.ecp.emfstore.ui.e3,
+ org.eclipse.emf.emfstore.performance.test,
+ org.eclipse.emf.emfstore.fuzzy.emf,
+ org.eclipse.emf.emfstore.client.ui.transaction,
+ org.eclipse.emf.emfstore.client.ui.test,
+ org.eclipse.emf.emfstore.ecore.test",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking;version="1.9.0";x-internal:=true,
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.commands;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.transaction,org.eclipse.emf.emfstore.client.test",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.example.merging,
+ org.eclipse.emf.emfstore.test.common",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test,org.eclipse.emf.emfstore.client.ui,org.eclipse.emf.emfstore.test.common",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.conflicts;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.conflict.options;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.merging.util;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui",
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.notification.filter;version="1.9.0";x-internal:=true,
+ org.eclipse.emf.emfstore.internal.client.model.changeTracking.notification.recording;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.test.common",
+ org.eclipse.emf.emfstore.internal.client.model.connectionmanager;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.example.helloworld,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.ecp.emfstore.ui,
+ org.eclipse.emf.emfstore.client.test.ui",
+ org.eclipse.emf.emfstore.internal.client.model.connectionmanager.xmlrpc;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.test.common",
+ org.eclipse.emf.emfstore.internal.client.model.controller;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui,org.eclipse.emf.emfstore.client.test,org.eclipse.emf.emfstore.example.merging",
+ org.eclipse.emf.emfstore.internal.client.model.exceptions;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.client.ui.test",
+ org.eclipse.emf.emfstore.internal.client.model.filetransfer;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test",
+ org.eclipse.emf.emfstore.internal.client.model.impl;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.client.test.ui,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.ecp.emfstore.ui.e3",
+ org.eclipse.emf.emfstore.internal.client.model.impl.api;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.example.merging,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.ecp.emfstore.ui,
+ org.eclipse.emf.ecp.emfstore.ui.e3,
+ org.eclipse.emf.emfstore.fuzzy.emf,
+ org.eclipse.emf.emfstore.client.test.ui,
+ org.eclipse.emf.emfstore.ecore.test",
+ org.eclipse.emf.emfstore.internal.client.model.util;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.model.edit,
+ org.eclipse.emf.emfstore.client.transaction,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.example.merging,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.ecp.emfstore.ui,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.test.ui,
+ org.eclipse.emf.emfstore.ecore.test",
+ org.eclipse.emf.emfstore.internal.client.observers;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.ecp.emfstore.ui.e3",
+ org.eclipse.emf.emfstore.internal.client.properties;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.test",
+ org.eclipse.emf.emfstore.internal.client.provider;version="1.0.2";x-internal:=true,
+ org.eclipse.emf.emfstore.internal.client.startup;version="1.0.2";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.client/pom.xml b/bundles/org.eclipse.emf.emfstore.client/pom.xml
index 7f81250..af59b47 100644
--- a/bundles/org.eclipse.emf.emfstore.client/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.client/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.client/schema/changeRecordingOptions.exsd b/bundles/org.eclipse.emf.emfstore.client/schema/changeRecordingOptions.exsd
index 46cae92..4f7a59d 100644
--- a/bundles/org.eclipse.emf.emfstore.client/schema/changeRecordingOptions.exsd
+++ b/bundles/org.eclipse.emf.emfstore.client/schema/changeRecordingOptions.exsd
@@ -110,6 +110,16 @@
</appInfo>
</annotation>
</attribute>
+ <attribute name="copier" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.emf.emfstore.client.util.ESCopier"/>
+ </appInfo>
+ </annotation>
+ </attribute>
</complexType>
</element>
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/util/ESCopier.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/util/ESCopier.java
new file mode 100644
index 0000000..1d64090
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/client/util/ESCopier.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.client.util;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+
+/**
+ * An interface that enables to specify a different copy behavior
+ * than standard {@link EcoreUtil#copy(EObject)}.
+ * The copy of an {@link EObject} should be self-contained, if possible, i.e.
+ * there should be no references pointing outside the copied containment tree.
+ *
+ * @since 1.9
+ *
+ */
+public interface ESCopier {
+
+ /**
+ * Whether this copier wants to copy the given {@link EObject}.
+ *
+ * @param eObject the {@link EObject} to be copied
+ * @return an integer that specifies how critical it is that the copier handles the given
+ * object. The copier that specifies the highest priority will be used to copy the object.
+ */
+ int shouldHandle(EObject eObject);
+
+ /**
+ * Copy the given {@link EObject}.
+ *
+ * @param eObject the {@link EObject} to be copied
+ * @return the copied {@link EObject}
+ */
+ EObject copy(EObject eObject);
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/common/UnknownEMFStoreWorkloadCommand.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/common/UnknownEMFStoreWorkloadCommand.java
index b4fb9f3..f0866be 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/common/UnknownEMFStoreWorkloadCommand.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/common/UnknownEMFStoreWorkloadCommand.java
@@ -43,8 +43,7 @@
* Singleton.
*/
private static class SingletonHolder {
- private static ScopedWorkspaceThreadPoolExecutor executor =
- new ScopedWorkspaceThreadPoolExecutor();
+ private static ScopedWorkspaceThreadPoolExecutor executor = new ScopedWorkspaceThreadPoolExecutor();
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/Behavior.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/Behavior.java
index 1d84561..83e6bb4 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/Behavior.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/Behavior.java
@@ -15,10 +15,12 @@
import java.util.List;
import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.emfstore.client.ESServer;
import org.eclipse.emf.emfstore.client.handler.ESChecksumErrorHandler;
import org.eclipse.emf.emfstore.client.handler.ESOperationModifier;
import org.eclipse.emf.emfstore.client.provider.ESClientConfigurationProvider;
+import org.eclipse.emf.emfstore.client.util.ESCopier;
import org.eclipse.emf.emfstore.common.extensionpoint.ESExtensionElement;
import org.eclipse.emf.emfstore.common.extensionpoint.ESExtensionPoint;
import org.eclipse.emf.emfstore.common.extensionpoint.ESExtensionPointException;
@@ -26,6 +28,7 @@
import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
import org.eclipse.emf.emfstore.internal.client.model.Usersession;
import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.KeyStoreManager;
+import org.eclipse.emf.emfstore.internal.client.model.impl.api.DefaultCopier;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESServerImpl;
import org.eclipse.emf.emfstore.internal.client.model.util.ChecksumErrorHandler;
import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation;
@@ -91,6 +94,11 @@
*/
public static final String OPERATION_MODIFIER = "operationModifier"; //$NON-NLS-1$
+ /**
+ * Copier option identifier.
+ */
+ public static final String COPIER = "copier"; //$NON-NLS-1$
+
private static Boolean isAutoSaveActive;
private static Boolean isRerecordingActive;
private static Boolean isCutOffIncomingCrossReferencesActive;
@@ -99,6 +107,7 @@
private static Boolean isUseMemoryChangePackageActive;
private static Optional<Integer> changePackageFragmentSize;
private static ESOperationModifier operationModifier;
+ private static List<ESCopier> copierList;
private ESChecksumErrorHandler checksumErrorHandler;
@@ -306,6 +315,29 @@
}
/**
+ * Returns the copier that is used to copy {@link EObject}s.
+ *
+ * @param eObject the {@link EObject} to be copied
+ *
+ * @return the copier
+ */
+ public ESCopier getESCopierFor(EObject eObject) {
+ if (copierList == null) {
+ copierList = new ESExtensionPoint(RESOURCE_OPTIONS_EXTENSION_POINT_NAME).getClasses(COPIER, ESCopier.class);
+ }
+
+ ESCopier selectedCopier = new DefaultCopier();
+ final int maxPriority = -1;
+ for (final ESCopier copier : copierList) {
+ if (copier.shouldHandle(eObject) > maxPriority) {
+ selectedCopier = copier;
+ }
+ }
+
+ return selectedCopier;
+ }
+
+ /**
* Sets the fragment size to be used when splitting change packages.
*
* @param fragmentSize
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/VersioningInfo.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/VersioningInfo.java
index a2e73d0..3cfc87a 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/VersioningInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/configuration/VersioningInfo.java
@@ -29,7 +29,7 @@
*/
public class VersioningInfo {
- private static final String CLIENT_NAME = "emfstore eclipse client";
+ private static final String CLIENT_NAME = "emfstore eclipse client"; //$NON-NLS-1$
/**
* Get the client version as specified
@@ -44,17 +44,17 @@
clientVersionInfo.setName(CLIENT_NAME);
String versionId;
- final ESExtensionElement version = new ESExtensionPoint("org.eclipse.emf.emfstore.client.clientVersion")
+ final ESExtensionElement version = new ESExtensionPoint("org.eclipse.emf.emfstore.client.clientVersion") //$NON-NLS-1$
.setThrowException(false).getFirst();
if (version != null) {
- final ESClientVersionProvider versionProvider = version.getClass("class", ESClientVersionProvider.class);
+ final ESClientVersionProvider versionProvider = version.getClass("class", ESClientVersionProvider.class); //$NON-NLS-1$
clientVersionInfo.setName(versionProvider.getName());
clientVersionInfo.setVersion(versionProvider.getVersion());
return clientVersionInfo;
}
- final Bundle emfStoreBundle = Platform.getBundle("org.eclipse.emf.emfstore.client");
+ final Bundle emfStoreBundle = Platform.getBundle("org.eclipse.emf.emfstore.client"); //$NON-NLS-1$
versionId = (String) emfStoreBundle.getHeaders().get(org.osgi.framework.Constants.BUNDLE_VERSION);
clientVersionInfo.setVersion(versionId);
@@ -67,7 +67,7 @@
* @return {@code true} if it is a release version, {@code false} otherwise
*/
public boolean isReleaseVersion() {
- return !isInternalReleaseVersion() && !getClientVersion().getVersion().endsWith("qualifier");
+ return !isInternalReleaseVersion() && !getClientVersion().getVersion().endsWith("qualifier"); //$NON-NLS-1$
}
/**
@@ -76,7 +76,7 @@
* @return {@code true} if it is an internal release, {@code false} otherwise
*/
public boolean isInternalReleaseVersion() {
- return getClientVersion().getVersion().endsWith("internal");
+ return getClientVersion().getVersion().endsWith("internal"); //$NON-NLS-1$
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelPackage.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelPackage.java
index 9bd45de..0b3457c 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelPackage.java
@@ -154,7 +154,7 @@
* The feature id for the '<em><b>Path</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
* @ordered
*/
@@ -317,7 +317,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__PROJECT = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 0;
+ int PROJECT_SPACE__PROJECT = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 0;
/**
* The feature id for the '<em><b>Project Id</b></em>' containment reference.
@@ -327,7 +328,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__PROJECT_ID = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 1;
+ int PROJECT_SPACE__PROJECT_ID = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 1;
/**
* The feature id for the '<em><b>Project Name</b></em>' attribute.
@@ -336,7 +338,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__PROJECT_NAME = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 2;
+ int PROJECT_SPACE__PROJECT_NAME = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 2;
/**
* The feature id for the '<em><b>Project Description</b></em>' attribute. <!-- begin-user-doc --> <!-- end-user-doc
@@ -345,7 +348,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__PROJECT_DESCRIPTION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 3;
+ int PROJECT_SPACE__PROJECT_DESCRIPTION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 3;
/**
* The feature id for the '<em><b>Usersession</b></em>' reference.
@@ -354,7 +358,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__USERSESSION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 4;
+ int PROJECT_SPACE__USERSESSION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 4;
/**
* The feature id for the '<em><b>Last Updated</b></em>' attribute.
@@ -363,7 +368,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__LAST_UPDATED = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 5;
+ int PROJECT_SPACE__LAST_UPDATED = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 5;
/**
* The feature id for the '<em><b>Base Version</b></em>' containment reference.
@@ -373,7 +379,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__BASE_VERSION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 6;
+ int PROJECT_SPACE__BASE_VERSION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 6;
/**
* The feature id for the '<em><b>Resource Count</b></em>' attribute.
@@ -382,7 +389,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__RESOURCE_COUNT = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 7;
+ int PROJECT_SPACE__RESOURCE_COUNT = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 7;
/**
* The feature id for the '<em><b>Dirty</b></em>' attribute.
@@ -391,7 +399,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__DIRTY = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 8;
+ int PROJECT_SPACE__DIRTY = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 8;
/**
* The feature id for the '<em><b>Old Log Messages</b></em>' attribute list.
@@ -401,7 +410,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__OLD_LOG_MESSAGES = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 9;
+ int PROJECT_SPACE__OLD_LOG_MESSAGES = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 9;
/**
* The feature id for the '<em><b>Waiting Uploads</b></em>' containment reference list.
@@ -411,7 +421,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__WAITING_UPLOADS = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 10;
+ int PROJECT_SPACE__WAITING_UPLOADS = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 10;
/**
* The feature id for the '<em><b>Properties</b></em>' containment reference list.
@@ -421,7 +432,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__PROPERTIES = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 11;
+ int PROJECT_SPACE__PROPERTIES = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 11;
/**
* The feature id for the '<em><b>Changed Shared Properties</b></em>' reference list.
@@ -431,7 +443,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__CHANGED_SHARED_PROPERTIES = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 12;
+ int PROJECT_SPACE__CHANGED_SHARED_PROPERTIES = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 12;
/**
* The feature id for the '<em><b>Workspace</b></em>' container reference.
@@ -441,7 +454,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__WORKSPACE = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 13;
+ int PROJECT_SPACE__WORKSPACE = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 13;
/**
* The feature id for the '<em><b>Local Change Package</b></em>' containment reference.
@@ -451,7 +465,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__LOCAL_CHANGE_PACKAGE = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 14;
+ int PROJECT_SPACE__LOCAL_CHANGE_PACKAGE = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 14;
/**
* The feature id for the '<em><b>Merged Version</b></em>' containment reference.
@@ -461,7 +476,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE__MERGED_VERSION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 15;
+ int PROJECT_SPACE__MERGED_VERSION = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 15;
/**
* The number of structural features of the '<em>Project Space</em>' class.
@@ -471,7 +487,8 @@
* @generated
* @ordered
*/
- int PROJECT_SPACE_FEATURE_COUNT = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT + 16;
+ int PROJECT_SPACE_FEATURE_COUNT = org.eclipse.emf.emfstore.internal.common.model.ModelPackage.IDENTIFIABLE_ELEMENT_FEATURE_COUNT
+ + 16;
/**
* The meta object id for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl
@@ -649,7 +666,7 @@
* {@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getPath <em>Path</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @return the meta object for the attribute '<em>Path</em>'.
* @see org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getPath()
* @see #getServerInfo()
@@ -1208,7 +1225,7 @@
* The meta object literal for the '<em><b>Path</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
EAttribute SERVER_INFO__PATH = eINSTANCE.getServerInfo_Path();
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/PendingFileTransfer.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/PendingFileTransfer.java
index 4915ee4..437445d 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/PendingFileTransfer.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/PendingFileTransfer.java
@@ -19,17 +19,19 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getAttachmentId <em>Attachment Id</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getFileVersion <em>File Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getChunkNumber <em>Chunk Number</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getFileVersion <em>File Version</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getChunkNumber <em>Chunk Number</em>}
+ * </li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#isUpload <em>Upload</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getFileName <em>File Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getPreliminaryFileName <em>Preliminary
- * File Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getPreliminaryFileName
+ * <em>Preliminary File Name</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ProjectSpace.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ProjectSpace.java
index 61d9aa5..02462a8 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ProjectSpace.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ProjectSpace.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Otto von Wesendonk, Edgar Mueller, Maximilian Koegel - initial API and implementation
******************************************************************************/
@@ -53,11 +53,11 @@
/**
* <!-- begin-user-doc --> A representation of the model object ' <em><b>Project Container</b></em>'.
- *
+ *
* @extends APIDelegate<ESLocalProjectImpl>
* <!-- end-user-doc
* -->
- *
+ *
* <p>
* The following features are supported:
* <ul>
@@ -95,7 +95,7 @@
* <em>Changed Shared Properties</em>}</li>
* </ul>
* </p>
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace()
* @model
* @generated
@@ -104,7 +104,7 @@
/**
* ID of the runnable change context option.
- *
+ *
* @generated NOT
*/
String RUNNABLE_CONTEXT_ID = "org.eclipse.emf.emfstore.client.runnableChangeContext"; //$NON-NLS-1$
@@ -117,7 +117,7 @@
* This may be used to provide a context while applying operations on a
* {@link org.eclipse.emf.emfstore.client.ESLocalProject}.
* </p>
- *
+ *
* @param runnableContext
* the runnable context to be set
*/
@@ -128,14 +128,14 @@
* EMFStore upon a commit. As long as the file is not yet committed, it can
* be removed by first retrieving the {@link FileInformation} via {@link #getFileInfo(FileIdentifier)} and then
* remove it via {@link FileInformation#cancelPendingUpload()}.
- *
+ *
* @param file
* to be added to the project space
* @return The file identifier the file was assigned to. This identifier can
* be used to retrieve the file later on
* @throws FileTransferException
* if any error occurs
- *
+ *
* @generated NOT
*/
FileIdentifier addFile(File file) throws FileTransferException;
@@ -145,7 +145,7 @@
* EMFStore upon a commit. As long as the file is not yet committed, it can
* be removed by first retrieving the {@link FileInformation} via {@link #getFileInfo(FileIdentifier)} and then
* remove it via {@link FileInformation#cancelPendingUpload()}.
- *
+ *
* @param file
* to be added to the project space
* @param fileIdentifier
@@ -154,60 +154,60 @@
* be used to retrieve the file later on
* @throws FileTransferException
* if any error occurs
- *
+ *
* @generated NOT
*/
FileIdentifier addFile(File file, String fileIdentifier) throws FileTransferException;
/**
* Adds a list of operations to this project space.
- *
+ *
* @param operations
* the list of operations to be added
- *
+ *
* @generated NOT
*/
void addOperations(List<? extends AbstractOperation> operations);
/**
* Adds a tag to the specified version of this project.
- *
+ *
* @param versionSpec
* the versionSpec
* @param tag
* the tag
* @throws ESException
* if exception occurs on the server
- *
+ *
* @generated NOT
*/
void addTag(PrimaryVersionSpec versionSpec, TagVersionSpec tag) throws ESException;
/**
* Begin a composite operation on the projectSpace.
- *
+ *
* @return a handle to abort or complete the operation
- *
+ *
* @generated NOT
*/
CompositeOperationHandle beginCompositeOperation();
/**
* Commits all pending changes of the project space.
- *
+ *
* @param monitor
* a progress monitor that may be used during the commit to indicate the progress
- *
+ *
* @throws ESException
* in case the commit went wrong
- *
+ *
* @return the current version specification
**/
PrimaryVersionSpec commit(IProgressMonitor monitor) throws ESException;
/**
* Commits all pending changes of the project space.
- *
+ *
* @param logMessage
* a log message describing the changes to be committed
* @param callback
@@ -216,12 +216,12 @@
* @param monitor
* an optional progress monitor to be used while the commit is in
* progress, may be <code>null</code>
- *
+ *
* @return the current version specification
- *
+ *
* @throws ESException
* in case the commit went wrong
- *
+ *
* @generated NOT
*/
PrimaryVersionSpec commit(String logMessage, ESCommitCallback callback, IProgressMonitor monitor)
@@ -231,8 +231,8 @@
* This method allows to commit changes to a new branch. It works very
* similar to {@link #commit(IProgressMonitor)} with the addition of a Branch specifier.
* Once the branch is created use {@link #commit(IProgressMonitor)} for further commits.
- *
- *
+ *
+ *
* @param branch
* branch specifier
* @param logMessage
@@ -251,7 +251,7 @@
/**
* Allows to merge a version from another branch into the current
* project space.
- *
+ *
* @param branchSpec
* the version which is supposed to be merged
* @param conflictResolver
@@ -266,7 +266,7 @@
/**
* Merges the resolved conflict sets.
- *
+ *
* @param conflictSet
* a set containing the conflicts
* @param myChangePackages
@@ -274,7 +274,7 @@
* @param theirChangePackages
* a list of containing the incoming change packages
* @return a merge change package
- *
+ *
* @throws ChangeConflictException in case the conflicts can not be resolved
*/
AbstractChangePackage mergeResolvedConflicts(ChangeConflictSet conflictSet,
@@ -284,7 +284,7 @@
/**
* Returns a list of branches of the current project. Every call triggers a
* server call.
- *
+ *
* @return list of {@link BranchInfo}
* @throws ESException
* in case of an exception
@@ -293,52 +293,52 @@
/**
* Export all local changes to a file.
- *
+ *
* @param file
* the file being exported to
* @throws IOException
* if writing to the given file fails
- *
+ *
* @generated NOT
*/
void exportLocalChanges(File file) throws IOException;
/**
* Export all local changes to a file.
- *
+ *
* @param file
* the file being exported to
* @param progressMonitor
* the progress monitor that should be used while exporting
* @throws IOException
* if writing to the given file fails
- *
+ *
* @generated NOT
*/
void exportLocalChanges(File file, IProgressMonitor progressMonitor) throws IOException;
/**
* Export a project to the given file.
- *
+ *
* @param file
* the file being exported to
* @throws IOException
* if writing to the given file fails
- *
+ *
* @generated NOT
*/
void exportProject(File file) throws IOException;
/**
* Export a project to the given file.
- *
+ *
* @param file
* the file being exported to
* @param progressMonitor
* the progress monitor that should be used during the export
* @throws IOException
* if writing to the given file fails
- *
+ *
* @generated NOT
*/
void exportProject(File file, IProgressMonitor progressMonitor) throws IOException;
@@ -351,7 +351,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Base Version</em>' containment reference.
* @see #setBaseVersion(PrimaryVersionSpec)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_BaseVersion()
@@ -371,7 +371,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Changed Shared Properties</em>' reference
* list.
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_ChangedSharedProperties()
@@ -390,7 +390,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Workspace</em>' container reference.
* @see #setWorkspace(Workspace)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_Workspace()
@@ -405,7 +405,7 @@
* <em>Workspace</em>}' container reference.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Workspace</em>' container reference.
* @see #getWorkspace()
* @generated
@@ -420,7 +420,7 @@
* more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Local Change Package</em>' containment reference.
* @see #setLocalChangePackage(AbstractChangePackage)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_LocalChangePackage()
@@ -434,20 +434,20 @@
* <em>Local Change Package</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
- * @param changePackage the new value of the '<em>Local Change Package</em>' containment reference.
+ *
+ * @param value the new value of the '<em>Local Change Package</em>' containment reference.
* @see #getLocalChangePackage()
* @generated
*/
- void setLocalChangePackage(AbstractChangePackage changePackage);
+ void setLocalChangePackage(AbstractChangePackage value);
/**
* Gathers all local operations and canonizes them.
- *
+ *
* @param canonize
* true if the operations should be canonized
* @return the list of operations
- *
+ *
* @generated NOT
*/
AbstractChangePackage getLocalChangePackage(boolean canonize);
@@ -460,7 +460,7 @@
* a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Merged Version</em>' containment reference.
* @see #setMergedVersion(PrimaryVersionSpec)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_MergedVersion()
@@ -474,7 +474,7 @@
* <em>Merged Version</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Merged Version</em>' containment reference.
* @see #getMergedVersion()
* @generated
@@ -504,14 +504,14 @@
* object which can be queried for the status of the download. Once the
* download is finished ( status.isFinished() ), the file can be retrieved
* from this status object by calling status.getTransferredFile().
- *
+ *
* @param fileIdentifier
* file identifier string.
* @return a status object that can be used to retrieve various information
* about the file.
* @throws FileTransferException
* if any error occurs retrieving the files
- *
+ *
* @generated NOT
*/
FileDownloadStatus getFile(FileIdentifier fileIdentifier) throws FileTransferException;
@@ -524,22 +524,22 @@
* FileInformation class is basically a facade to keep the interface in the
* project space small (only getFileInfo) while still providing a rich
* interface for files.
- *
+ *
* @param fileIdentifier
* the file identifier for which to get the information
* @return the information for that identifier.
- *
+ *
* @generated NOT
*/
FileInformation getFileInfo(FileIdentifier fileIdentifier);
/**
* Gets a list of history infos.
- *
+ *
* @param query
* the query to be performed in order to fetch the history
* information
- *
+ *
* @see Workspace
* @return a list of history infos
* @throws ESException
@@ -556,7 +556,7 @@
* here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Last Updated</em>' attribute.
* @see #setLastUpdated(Date)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_LastUpdated()
@@ -574,7 +574,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Old Log Messages</em>' attribute list.
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_OldLogMessages()
* @model
@@ -584,7 +584,7 @@
/**
* Get the {@link OperationManager} for this {@link ProjectSpace}.
- *
+ *
* @return the operation manager
* @generated NOT
*/
@@ -598,7 +598,7 @@
* here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Project</em>' containment reference.
* @see #setProject(Project)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_Project()
@@ -615,7 +615,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Project Description</em>' attribute.
* @see #setProjectDescription(String)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_ProjectDescription()
@@ -632,7 +632,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Project Id</em>' containment reference.
* @see #setProjectId(ProjectId)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_ProjectId()
@@ -643,9 +643,9 @@
/**
* Get a project info for the project space.
- *
+ *
* @return a project info
- *
+ *
* @generated NOT
*/
ProjectInfo getProjectInfo();
@@ -658,7 +658,7 @@
* here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Project Name</em>' attribute.
* @see #setProjectName(String)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_ProjectName()
@@ -677,7 +677,7 @@
* If the meaning of the '<em>Properties</em>' map isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Properties</em>' containment reference
* list.
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_Properties()
@@ -688,7 +688,7 @@
/**
* Get the {@link PropertyManager} for this {@link ProjectSpace}.
- *
+ *
* @return the property manager
* @generated NOT
*/
@@ -702,7 +702,7 @@
* here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Usersession</em>' reference.
* @see #setUsersession(Usersession)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_Usersession()
@@ -721,7 +721,7 @@
* more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Waiting Uploads</em>' containment reference
* list.
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_WaitingUploads()
@@ -732,7 +732,7 @@
/**
* Import changes from a file.
- *
+ *
* @param fileName
* the file name to import from
* @throws IOException
@@ -743,14 +743,14 @@
/**
* Initialize the project space and its resources.
- *
+ *
* @generated NOT
*/
void init();
/**
* Initialize the resources of the project space.
- *
+ *
* @param resourceSet
* the resource set the project space should use
* @generated NOT
@@ -759,12 +759,12 @@
/**
* Deletes the project space.
- *
+ *
* @param monitor
* a progress monitor that may be used during the delete to indicate the progress
- *
+ *
* @generated NOT
- *
+ *
* @throws IOException
* in case the project space could not be deleted
*/
@@ -772,16 +772,16 @@
/**
* Returns the resource set of the ProjectSpace.
- *
+ *
* @return resource set of the ProjectSpace
- *
+ *
* @generated NOT
*/
ResourceSet getResourceSet();
/**
* Sets the resource set of the project space.
- *
+ *
* @param resourceSet
* the resource set to be used by this project space
*/
@@ -795,7 +795,7 @@
* here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Dirty</em>' attribute.
* @see #setDirty(boolean)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_Dirty()
@@ -806,9 +806,9 @@
/**
* Shows whether projectSpace is transient.
- *
+ *
* @return true, if transient.
- *
+ *
* @generated NOT
*/
boolean isTransient();
@@ -816,11 +816,11 @@
/**
* Determines whether the project is up to date, that is, whether the base
* revision and the head revision are equal.
- *
+ *
* @return true, if the project is up to date, false otherwise
* @throws ESException
* if the head revision can not be resolved
- *
+ *
* @generated NOT
*/
boolean isUpdated() throws ESException;
@@ -829,28 +829,28 @@
* Will make the projectSpace transient, it will not make its content or
* changes persistent. Can only be called before the resources or the
* project space have been initialized.
- *
+ *
* @generated NOT
*/
void makeTransient();
/**
* Removes a tag to the specified version of this project.
- *
+ *
* @param versionSpec
* the versionSpec
* @param tag
* the tag
* @throws ESException
* if exception occurs on the server
- *
+ *
* @generated NOT
*/
void removeTag(PrimaryVersionSpec versionSpec, TagVersionSpec tag) throws ESException;
/**
* Resolve the url to a model element.
- *
+ *
* @param modelElementUrlFragment
* the url
* @return the model element
@@ -862,12 +862,12 @@
/**
* <!-- begin-user-doc --> Resolve a version spec to a primary version spec.
- *
+ *
* @param versionSpec
* the spec to resolve
* @param monitor
* a progress monitor that may be used during resolving the version to indicate the progress
- *
+ *
* @return the primary version specifier <!-- end-user-doc -->
* @throws ESException
* if resolving fails
@@ -879,7 +879,7 @@
/**
* Revert all local changes in the project space. Returns the state of the
* project to that of the project space base version.
- *
+ *
* @generated NOT
*/
void revert();
@@ -889,7 +889,7 @@
* <em>Base Version</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Base Version</em>' containment reference.
* @see #getBaseVersion()
* @generated
@@ -904,7 +904,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Resource Count</em>' attribute.
* @see #setResourceCount(int)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getProjectSpace_ResourceCount()
@@ -918,7 +918,7 @@
* <em>Resource Count</em>}' attribute.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Resource Count</em>' attribute.
* @see #getResourceCount()
* @generated
@@ -929,7 +929,7 @@
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#isDirty <em>Dirty</em>}
* ' attribute.
* <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Dirty</em>' attribute.
* @see #isDirty()
* @generated
@@ -941,7 +941,7 @@
* <em>Last Updated</em>}' attribute.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Last Updated</em>' attribute.
* @see #getLastUpdated()
* @generated
@@ -953,7 +953,7 @@
* <em>Project</em>}' containment reference.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Project</em>' containment reference.
* @see #getProject()
* @generated
@@ -965,7 +965,7 @@
* <em>Project Description</em>}' attribute.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Project Description</em>' attribute.
* @see #getProjectDescription()
* @generated
@@ -977,7 +977,7 @@
* <em>Project Id</em>}' containment reference.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Project Id</em>' containment reference.
* @see #getProjectId()
* @generated
@@ -989,7 +989,7 @@
* <em>Project Name</em>}' attribute.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Project Name</em>' attribute.
* @see #getProjectName()
* @generated
@@ -998,7 +998,7 @@
/**
* Sets a new OrgUnitProperty for the current user.
- *
+ *
* @param property
* the new property
* @generated NOT
@@ -1010,7 +1010,7 @@
* <em>Usersession</em>}' reference.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Usersession</em>' reference.
* @see #getUsersession()
* @generated
@@ -1019,9 +1019,9 @@
/**
* Shares this project space.
- *
+ *
* @return the project info of the created project
- *
+ *
* @throws ESException
* if an error occurs during the sharing of the project
*/
@@ -1029,14 +1029,14 @@
/**
* Shares this project space.
- *
+ *
* @param session
* the {@link Usersession} that should be used for sharing the
* project
* @param monitor
* an instance of an {@link IProgressMonitor}
* @return the project info of the remote project
- *
+ *
* @throws ESException
* if an error occurs during the sharing of the project
*/
@@ -1044,34 +1044,34 @@
/**
* Transmit the OrgUnitproperties to the server.
- *
+ *
* @generated NOT
*/
void transmitProperties();
/**
* Undo the last operation of the projectSpace.
- *
+ *
* @generated NOT
*/
void undoLastOperation();
/**
* Undo the last operation <em>n</em> operations of the projectSpace.
- *
+ *
* @param nrOperations
* the number of operations to be undone
- *
+ *
* @generated NOT
*/
void undoLastOperations(int nrOperations);
/**
* <!-- begin-user-doc --> Update the project to the head version.
- *
+ *
* @param monitor
* a progress monitor that may be used during update to indicate progress
- *
+ *
* @return the new base version
* @throws ESException
* if update fails <!-- end-user-doc -->
@@ -1082,7 +1082,7 @@
/**
* <!-- begin-user-doc --> Update the project to the given version.
- *
+ *
* @param version
* the version to update to
* @return the new base version
@@ -1095,7 +1095,7 @@
/**
* Update the workspace to the given revision.
- *
+ *
* @param version
* the {@link VersionSpec} to update to
* @param callback
@@ -1104,10 +1104,10 @@
* @param progress
* an {@link IProgressMonitor} instance
* @return the current version specifier
- *
+ *
* @throws ESException
* in case the update went wrong
- *
+ *
* @generated NOT
*/
PrimaryVersionSpec update(VersionSpec version, ESUpdateCallback callback, IProgressMonitor progress)
@@ -1115,25 +1115,25 @@
/**
* Determine if the project space has unsaved changes to any element in the project.
- *
+ *
* @return true if there is unsaved changes.
- *
+ *
* @generated NOT
*/
boolean hasUnsavedChanges();
/**
* Saves the project space.
- *
+ *
* @generated NOT
*/
void save();
/**
* Whether this project space has been shared.
- *
+ *
* @return true, if the project space has been shared, false otherwise
- *
+ *
* @generated NOT
*/
boolean isShared();
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ServerInfo.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ServerInfo.java
index 245ca22..089c026 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ServerInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ServerInfo.java
@@ -24,6 +24,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getUrl <em>Url</em>}</li>
@@ -31,12 +32,11 @@
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getPath <em>Path</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getProjectInfos <em>Project Infos</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getLastUsersession <em>Last Usersession
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getCertificateAlias <em>Certificate
- * Alias</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getLastUsersession
+ * <em>Last Usersession</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getCertificateAlias
+ * <em>Certificate Alias</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo()
* @model
@@ -131,7 +131,7 @@
* If the meaning of the '<em>Path</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Path</em>' attribute.
* @see #setPath(String)
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_Path()
@@ -145,7 +145,7 @@
* attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Path</em>' attribute.
* @see #getPath()
* @generated
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Usersession.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Usersession.java
index da8bf8d..dd56c00 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Usersession.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Usersession.java
@@ -28,20 +28,21 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getUsername <em>Username</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPassword <em>Password</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getSessionId <em>Session Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPersistentPassword <em>Persistent
- * Password</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getServerInfo <em>Server Info</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPersistentPassword
+ * <em>Persistent Password</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getServerInfo <em>Server Info</em>}
+ * </li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#isSavePassword <em>Save Password</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getACUser <em>AC User</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getChangedProperties <em>Changed
- * Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getChangedProperties
+ * <em>Changed Properties</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Workspace.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Workspace.java
index 9b4129a..a2845c5 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Workspace.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/Workspace.java
@@ -40,13 +40,15 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Workspace#getProjectSpaces <em>Project Spaces
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Workspace#getServerInfos <em>Server Infos</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Workspace#getUsersessions <em>Usersessions</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Workspace#getProjectSpaces <em>Project Spaces</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Workspace#getServerInfos <em>Server Infos</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.Workspace#getUsersessions <em>Usersessions</em>}
+ * </li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getWorkspace()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/NotificationToOperationConverter.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/NotificationToOperationConverter.java
index 24a5690..49f2808 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/NotificationToOperationConverter.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/NotificationToOperationConverter.java
@@ -409,7 +409,8 @@
operation.setModelElementId(id);
}
- private static void setBidirectionalAndContainmentInfo(ReferenceOperation referenceOperation, EReference reference) {
+ private static void setBidirectionalAndContainmentInfo(ReferenceOperation referenceOperation,
+ EReference reference) {
if (reference.getEOpposite() != null) {
referenceOperation.setBidirectional(true);
referenceOperation.setOppositeFeatureName(reference.getEOpposite().getName());
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictContext.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictContext.java
index 08804c6..55141ca 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictContext.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/ConflictContext.java
@@ -62,9 +62,9 @@
*/
public ConflictContext(DecisionManager manager, AbstractOperation myOperation, AbstractOperation theirOperation) {
this(manager.getModelElement(myOperation.getModelElementId()),
- myOperation instanceof FeatureOperation ?
- ((FeatureOperation) myOperation).getFeatureName()
- : StringUtils.EMPTY, manager.getAuthorForOperation(theirOperation));
+ myOperation instanceof FeatureOperation ? ((FeatureOperation) myOperation).getFeatureName()
+ : StringUtils.EMPTY,
+ manager.getAuthorForOperation(theirOperation));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/VisualConflict.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/VisualConflict.java
index f6152cb..1361a8a 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/VisualConflict.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/VisualConflict.java
@@ -79,7 +79,8 @@
* @param leftIsMy true if left operation is my operation
* @param init true if conflict should be initialized on construction
*/
- public VisualConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean leftIsMy, boolean init) {
+ public VisualConflict(ConflictBucket conflictBucket, DecisionManager decisionManager, boolean leftIsMy,
+ boolean init) {
this(leftIsMy ? conflictBucket.getMyOperations() : conflictBucket.getTheirOperations(),
leftIsMy ? conflictBucket.getTheirOperations() : conflictBucket.getMyOperations(),
leftIsMy ? conflictBucket.getMyOperation() : conflictBucket.getTheirOperation(),
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiReferenceConflict.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiReferenceConflict.java
index 000fcf8..cbf740c 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiReferenceConflict.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/merging/conflict/conflicts/MultiReferenceConflict.java
@@ -134,12 +134,11 @@
getClassAndName(getDecisionManager()
.getModelElement(getTheirOperation().getModelElementId()))));
} else {
- myOption.setOptionLabel(isLeftMy() ?
- Messages.MultiReferenceConflict_Add
+ myOption.setOptionLabel(isLeftMy() ? Messages.MultiReferenceConflict_Add
: Messages.MultiReferenceConflict_Remove
+ " " + getClassAndName(target)); //$NON-NLS-1$
- theirOption.setOptionLabel(!isLeftMy() ?
- Messages.MultiReferenceConflict_Add : Messages.MultiReferenceConflict_Remove
+ theirOption.setOptionLabel(
+ !isLeftMy() ? Messages.MultiReferenceConflict_Add : Messages.MultiReferenceConflict_Remove
+ " " + getClassAndName(target)); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/FilterStack.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/FilterStack.java
index a206a02..1c4accb 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/FilterStack.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/FilterStack.java
@@ -37,7 +37,7 @@
private static final String NOTIFICATION_FILTER_EXTENSION_ID = "org.eclipse.emf.emfstore.client.notificationFilter"; //$NON-NLS-1$
private static final ESNotificationFilter[] DEFAULT_STACK = { new TouchFilter(), new TransientFilter(),
- new UnknownEventTypeFilter(), new EmptyRemovalsFilter(), new IgnoreDatatypeFilter(),
+ new UnknownEventTypeFilter(), new EmptyRemovalsFilter(), // new IgnoreDatatypeFilter(),
new IgnoreOutsideProjectReferencesFilter(), new IgnoreNullFeatureNotificationsFilter(),
new NotifiableIdEObjectCollectionFilter(), new IgnoreNotificationsOutsideProject() };
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/IgnoreDatatypeFilter.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/IgnoreDatatypeFilter.java
deleted file mode 100644
index 2321019..0000000
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/changeTracking/notification/filter/IgnoreDatatypeFilter.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
- * Technische Universitaet Muenchen.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- ******************************************************************************/
-package org.eclipse.emf.emfstore.internal.client.model.changeTracking.notification.filter;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.emfstore.client.handler.ESNotificationFilter;
-import org.eclipse.emf.emfstore.common.model.ESObjectContainer;
-import org.eclipse.emf.emfstore.common.model.util.ESNotificationInfo;
-import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
-
-/**
- * Filters notifications which come from datatypes that should be ignored.
- *
- * @author emueller
- */
-public class IgnoreDatatypeFilter implements ESNotificationFilter {
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.client.handler.ESNotificationFilter#check(org.eclipse.emf.emfstore.common.model.util.ESNotificationInfo,
- * org.eclipse.emf.emfstore.common.model.ESObjectContainer)
- */
- public boolean check(ESNotificationInfo notificationInfo, ESObjectContainer<?> container) {
-
- final Object newValue = notificationInfo.getNewValue();
- final Object oldValue = notificationInfo.getOldValue();
- final Object notifier = notificationInfo.getNotifier();
- boolean ignore = false;
-
- if (newValue != null && newValue instanceof EObject) {
- ignore = ModelUtil.isIgnoredDatatype((EObject) newValue);
- }
-
- if (oldValue != null && oldValue instanceof EObject) {
- ignore = ignore || ModelUtil.isIgnoredDatatype((EObject) oldValue);
- }
-
- if (notifier != null && notifier instanceof EObject) {
- ignore = ignore || ModelUtil.isIgnoredDatatype((EObject) notifier);
- }
-
- return ignore;
- }
-}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/KeyStoreManager.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/KeyStoreManager.java
index 3861c45..77917d0 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/KeyStoreManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/KeyStoreManager.java
@@ -77,7 +77,7 @@
/**
* Certificate Alias for development test certificate.
*/
- public static final String DEFAULT_CERTIFICATE = "emfstore test certificate (do not use in production!)"; // "EMFStore Test Certificate (DO NOT USE IN PRODUCTION!)"; //$NON-NLS-1$
+ public static final String DEFAULT_CERTIFICATE = "emfstore test certificate (do not use in production!)"; //$NON-NLS-1$
private static KeyStoreManager instance;
@@ -93,7 +93,7 @@
private void loadConfiguration() {
final ESClientConfigurationProvider provider = new ESExtensionPoint(
ORG_ECLIPSE_EMF_EMFSTORE_CLIENT_DEFAULT_CONFIGURATION_PROVIDER).getClass(PROVIDER_CLASS,
- ESClientConfigurationProvider.class);
+ ESClientConfigurationProvider.class);
if (provider == null) {
return;
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/ServerCall.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/ServerCall.java
index adc7b92..0d303c3 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/ServerCall.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/ServerCall.java
@@ -26,7 +26,8 @@
import org.eclipse.emf.emfstore.server.exceptions.ESException;
/**
- * This class is intended to wrap all server calls. It may be used either by sub-classing or using anonymous classes.<br/>
+ * This class is intended to wrap all server calls. It may be used either by sub-classing or using anonymous classes.
+ * <br/>
* The {@link SessionManager} ensures there's a valid session before executing the call.<br/>
* For call of the {@link ConnectionManager}, always use {@link #getSessionId()}, since it is injected by the
* {@link SessionManager}.<br/>
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/Messages.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/Messages.java
index ee286bd..70a256c 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/Messages.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/Messages.java
@@ -26,6 +26,7 @@
public static String XmlRpcClientManager_DownloadOfFragmentFailed;
public static String XmlRpcClientManager_UploadChangePackageFragmentCallFailed;
public static String XmlRpcClientManager_Malformed_URL_Or_Port;
+ public static String XmlRpcClientManager_NoValidProjectId;
public static String XmlRpcClientManager_NoValidSessionAndOrProjectId;
public static String XmlRpcClientManager_NoValidSessionId;
public static String XmlRpcClientManager_SaveChangePackageFailed;
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcAdminConnectionManager.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcAdminConnectionManager.java
index 03a0102..16a9d98 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcAdminConnectionManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcAdminConnectionManager.java
@@ -34,7 +34,7 @@
*
* @author wesendon
*/
-public class XmlRpcAdminConnectionManager extends AbstractConnectionManager<XmlRpcClientManager>implements
+public class XmlRpcAdminConnectionManager extends AbstractConnectionManager<XmlRpcClientManager> implements
AdminConnectionManager {
private static final String ASSIGN_ROLE = "assignRole"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcClientManager.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcClientManager.java
index b83ab36..f1cedd1 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcClientManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcClientManager.java
@@ -182,7 +182,10 @@
try {
final T result = (T) client.execute(serverInterface + "." + methodName, adjustedParams); //$NON-NLS-1$
- return adjustResult(ESCollections.find(params, SessionId.class), result);
+ return adjustResult(
+ ESCollections.find(params, SessionId.class),
+ ESCollections.find(params, ProjectId.class),
+ result);
} catch (final XmlRpcException e) {
if (e.getCause() instanceof ESException) {
@@ -225,33 +228,40 @@
}
@SuppressWarnings({ "rawtypes", "unchecked" })
- private <T> T adjustResult(final Optional<SessionId> maybeSessionId, final T result) throws ESException {
+ private <T> T adjustResult(
+ final Optional<SessionId> maybeSessionId,
+ final Optional<ProjectId> maybeProjectId,
+ final T result) throws ESException {
if (result instanceof Object[]) {
final Object[] objects = (Object[]) result;
for (int i = 0; i < objects.length; i++) {
final Object item = objects[i];
- objects[i] = adjustResult(maybeSessionId, item);
+ objects[i] = adjustResult(maybeSessionId, maybeProjectId, item);
}
return (T) objects;
} else if (result instanceof List) {
final List l = (List) result;
for (int i = 0; i < l.size(); i++) {
- l.set(i, adjustResult(maybeSessionId, result));
+ l.set(i, adjustResult(maybeSessionId, maybeProjectId, result));
}
} else if (result instanceof ChangePackageProxy) {
- return (T) downloadAndResolveChangePackage((ChangePackageProxy) result, maybeSessionId);
+ return (T) downloadAndResolveChangePackage((ChangePackageProxy) result, maybeSessionId, maybeProjectId);
}
return result;
}
private AbstractChangePackage downloadAndResolveChangePackage(final ChangePackageProxy proxy,
- final Optional<SessionId> maybeSession) throws ESException {
+ final Optional<SessionId> maybeSession, Optional<ProjectId> maybeProjectId) throws ESException {
if (!maybeSession.isPresent()) {
throw new ESException(Messages.XmlRpcClientManager_NoValidSessionId);
}
+ if (!maybeProjectId.isPresent()) {
+ throw new ESException(Messages.XmlRpcClientManager_NoValidProjectId);
+ }
+
int fragmentIndex = 0;
final FileBasedChangePackage changePackage = VersioningFactory.eINSTANCE
.createFileBasedChangePackage();
@@ -265,6 +275,7 @@
do {
envelope = executeCall("downloadChangePackageFragment", ChangePackageEnvelope.class, new Object[] { //$NON-NLS-1$
maybeSession.get(),
+ maybeProjectId.get(),
proxy.getId(),
fragmentIndex
});
@@ -297,7 +308,7 @@
private ChangePackageProxy uploadInFragments(SessionId sessionId,
ProjectId projectId, FileBasedChangePackage changePackage)
- throws ESException {
+ throws ESException {
// get() is guarded
final Iterator<ChangePackageEnvelope> envelopes = ChangePackageUtil.splitChangePackage(
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcConnectionManager.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcConnectionManager.java
index 1bbf186..1fdf753 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcConnectionManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/XmlRpcConnectionManager.java
@@ -17,6 +17,7 @@
import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.AbstractConnectionManager;
import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ConnectionManager;
+import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreClientUtil;
import org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty;
import org.eclipse.emf.emfstore.internal.common.model.Project;
import org.eclipse.emf.emfstore.internal.server.connection.xmlrpc.XmlRpcConnectionHandler;
@@ -51,7 +52,9 @@
* @author wesendon
*/
public class XmlRpcConnectionManager extends AbstractConnectionManager<XmlRpcClientManager> implements
-ConnectionManager {
+ ConnectionManager {
+
+ private static final String LOGGING_PREFIX = "XMLRPC-Client"; //$NON-NLS-1$
/**
* {@inheritDoc}
@@ -106,6 +109,7 @@
public PrimaryVersionSpec createVersion(SessionId sessionId, ProjectId projectId,
PrimaryVersionSpec baseVersionSpec, AbstractChangePackage changePackage, BranchVersionSpec targetBranch,
PrimaryVersionSpec sourceVersion, LogMessage logMessage) throws ESException, InvalidVersionSpecException {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Server call to create version", projectId, targetBranch); //$NON-NLS-1$
return getConnectionProxy(sessionId).callWithResult("createVersion", PrimaryVersionSpec.class, sessionId, //$NON-NLS-1$
projectId, baseVersionSpec, changePackage, targetBranch, sourceVersion, logMessage);
}
@@ -120,7 +124,8 @@
/**
* {@inheritDoc}
*/
- public FileChunk downloadFileChunk(SessionId sessionId, ProjectId projectId, FileTransferInformation fileInformation)
+ public FileChunk downloadFileChunk(SessionId sessionId, ProjectId projectId,
+ FileTransferInformation fileInformation)
throws ESException {
return getConnectionProxy(sessionId).callWithResult("downloadFileChunk", FileChunk.class, sessionId, projectId, //$NON-NLS-1$
fileInformation);
@@ -140,6 +145,8 @@
*/
public List<AbstractChangePackage> getChanges(SessionId sessionId, ProjectId projectId, VersionSpec source,
VersionSpec target) throws InvalidVersionSpecException, ESException {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Server call to get changes", projectId, //$NON-NLS-1$
+ source == null ? null : source.getBranch());
return getConnectionProxy(sessionId).callWithListResult("getChanges", AbstractChangePackage.class, sessionId, //$NON-NLS-1$
projectId, source, target);
}
@@ -322,17 +329,20 @@
}
/**
+ *
* {@inheritDoc}
*
* @see org.eclipse.emf.emfstore.internal.server.EMFStore#downloadChangePackageFragment(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * java.lang.String, int)
+ * org.eclipse.emf.emfstore.internal.server.model.ProjectId, java.lang.String, int)
*/
- public ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, String proxyId, int fragmentIndex)
+ public ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, ProjectId projectId, String proxyId,
+ int fragmentIndex)
throws ESException {
return getConnectionProxy(sessionId)
.callWithResult("downloadChangePackageFragment", //$NON-NLS-1$
ChangePackageEnvelope.class,
sessionId,
+ projectId,
proxyId,
fragmentIndex);
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/messages.properties b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/messages.properties
index 14e365c..e20d259 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/messages.properties
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/connectionmanager/xmlrpc/messages.properties
@@ -2,6 +2,7 @@
XmlRpcClientManager_DownloadOfFragmentFailed=Download of change package fragment failed
XmlRpcClientManager_UploadChangePackageFragmentCallFailed=Could not create change package fragment.
XmlRpcClientManager_Malformed_URL_Or_Port=Malformed URL or Port
+XmlRpcClientManager_NoValidProjectId=Cannot resolve a change package proxy because no valid project ID present.
XmlRpcClientManager_NoValidSessionAndOrProjectId=Cannot fragment change package without valid session and project ID.
XmlRpcClientManager_NoValidSessionId=Cannot resolve a change package proxy because no valid session ID present.
XmlRpcClientManager_SaveChangePackageFailed=Could not save change package.
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/CommitController.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/CommitController.java
index 9745eaa..07a0117 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/CommitController.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/CommitController.java
@@ -26,6 +26,7 @@
import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ServerCall;
import org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceBase;
+import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreClientUtil;
import org.eclipse.emf.emfstore.internal.client.model.util.WorkspaceUtil;
import org.eclipse.emf.emfstore.internal.common.model.Project;
import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
@@ -48,6 +49,8 @@
*/
public class CommitController extends ServerCall<PrimaryVersionSpec> {
+ private static final String LOGGING_PREFIX = "COMMIT"; //$NON-NLS-1$
+
private final String logMessage;
private final ESCommitCallback callback;
private final BranchVersionSpec branch;
@@ -104,8 +107,12 @@
private PrimaryVersionSpec commit(final String logMessage, final BranchVersionSpec branch)
throws InvalidVersionSpecException, ESUpdateRequiredException, ESException {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "CommitController started", getProjectSpace(), branch, //$NON-NLS-1$
+ getUsersession());
if (!getProjectSpace().isShared()) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Stopping commit because project is not shared", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
throw new ESProjectNotSharedException();
}
@@ -116,6 +123,8 @@
// check if there are any changes. Branch commits are allowed with no changes, whereas normal commits are not.
if (!getProjectSpace().isDirty() && branch == null) {
callback.noLocalChanges(getProjectSpace().toAPI());
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Stopping commit because no changes and no new branch", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
return getProjectSpace().getBaseVersion();
}
@@ -127,6 +136,8 @@
getProgressMonitor().worked(10);
getProgressMonitor().subTask(Messages.CommitController_GatheringChanges);
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Gathering changes...", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
final AbstractChangePackage localChangePackage = getProjectSpace().getLocalChangePackage();
@@ -138,14 +149,23 @@
final ModelElementIdToEObjectMappingImpl idToEObjectMapping = new ModelElementIdToEObjectMappingImpl(
getProjectSpace().getProject(), localChangePackage);
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Gathering changes... done", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
+
getProgressMonitor().subTask(Messages.CommitController_PresentingChanges);
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Presenting changes...", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
if (!callback.inspectChanges(getProjectSpace().toAPI(),
localChangePackage.toAPI(),
idToEObjectMapping.toAPI())
|| getProgressMonitor().isCanceled()) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Commit vetoed by ESCommitCallback/ProgressMonitor", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
return getProjectSpace().getBaseVersion();
}
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Presenting changes... done", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
getProgressMonitor().subTask(Messages.CommitController_SendingFilesToServer);
// TODO reimplement with ObserverBus and think about subtasks for commit
@@ -163,10 +183,17 @@
localChangePackage.toAPI(),
idToEObjectMapping.toAPI())
|| getProgressMonitor().isCanceled()) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX,
+ "Stopping commit because updated project was vetoed.", getProjectSpace(), branch, getUsersession()); //$NON-NLS-1$
return getProjectSpace().getBaseVersion();
}
}
+ return commitAfterUpdate(branch, localChangePackage);
+ }
+
+ private PrimaryVersionSpec commitAfterUpdate(final BranchVersionSpec branch,
+ final AbstractChangePackage localChangePackage) throws ESException {
final PrimaryVersionSpec newBaseVersion = performCommit(branch, localChangePackage);
// TODO reimplement with ObserverBus and think about subtasks for commit
@@ -195,6 +222,8 @@
ESWorkspaceProviderImpl.getObserverBus().notify(ESCommitObserver.class)
.commitCompleted(getProjectSpace().toAPI(), newBaseVersion.toAPI(), getProgressMonitor());
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Commit successful", getProjectSpace(), branch, //$NON-NLS-1$
+ getUsersession());
return newBaseVersion;
}
@@ -220,6 +249,8 @@
private PrimaryVersionSpec performCommit(final BranchVersionSpec branch, final AbstractChangePackage changePackage)
throws ESException {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Perform commit..", getProjectSpace(), branch, //$NON-NLS-1$
+ getUsersession());
// Branching case: branch specifier added
final PrimaryVersionSpec newBaseVersion = new UnknownEMFStoreWorkloadCommand<PrimaryVersionSpec>(
getProgressMonitor()) {
@@ -235,6 +266,8 @@
changePackage.getLogMessage());
}
}.execute();
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Perform commit.. done", getProjectSpace(), branch, //$NON-NLS-1$
+ getUsersession());
return newBaseVersion;
}
@@ -253,9 +286,15 @@
private boolean performChecksumCheck(PrimaryVersionSpec newBaseVersion, Project project)
throws SerializationException {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Perform checksum check..", getProjectSpace(), branch, //$NON-NLS-1$
+ getUsersession());
if (Configuration.getClientBehavior().isChecksumCheckActive()) {
final long computedChecksum = ModelUtil.computeChecksum(project);
+ EMFStoreClientUtil.logProjectDetails(
+ LOGGING_PREFIX, MessageFormat.format("Computed Checksum: {0} , ProjectState Checksum: {1}", //$NON-NLS-1$
+ computedChecksum, newBaseVersion.getProjectStateChecksum()),
+ getProjectSpace(), branch, getUsersession());
return computedChecksum == newBaseVersion.getProjectStateChecksum();
}
@@ -268,6 +307,8 @@
if (branch != null) {
// check branch conditions
if (StringUtils.isEmpty(branch.getBranch())) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Stopping commit because of empty branch name", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
throw new InvalidVersionSpecException(Messages.CommitController_EmptyBranchName);
}
PrimaryVersionSpec potentialBranch = null;
@@ -286,7 +327,11 @@
.resolveVersionSpec(
Versions.createHEAD(getProjectSpace().getBaseVersion()), monitor);
if (!getProjectSpace().getBaseVersion().equals(resolvedVersion)) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Update required", getProjectSpace(), branch, //$NON-NLS-1$
+ getUsersession());
if (!callback.baseVersionOutOfDate(getProjectSpace().toAPI(), getProgressMonitor())) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Stopping commit because update required", //$NON-NLS-1$
+ getProjectSpace(), branch, getUsersession());
throw new ESUpdateRequiredException();
}
return true;
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/UpdateController.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/UpdateController.java
index 4374b07..015f12c 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/UpdateController.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/UpdateController.java
@@ -28,6 +28,7 @@
import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.ServerCall;
import org.eclipse.emf.emfstore.internal.client.model.exceptions.ChangeConflictException;
import org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceBase;
+import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreClientUtil;
import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreCommand;
import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.internal.server.conflictDetection.ChangeConflictSet;
@@ -54,6 +55,8 @@
*/
public class UpdateController extends ServerCall<PrimaryVersionSpec> {
+ private static final String LOGGING_PREFIX = "UPDATE"; //$NON-NLS-1$
+
private final VersionSpec version;
private final ESUpdateCallback callback;
@@ -98,6 +101,8 @@
*/
@Override
protected PrimaryVersionSpec run() throws ESException {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Starting update", getProjectSpace(), version.getBranch(), //$NON-NLS-1$
+ getUsersession());
return doUpdate(version);
}
@@ -107,11 +112,15 @@
getProgressMonitor().subTask(Messages.UpdateController_ResolvingNewVersion);
final PrimaryVersionSpec resolvedVersion = getProjectSpace().resolveVersionSpec(version, getProgressMonitor());
if (equalsBaseVersion(resolvedVersion)) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Update not required", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
return resolvedVersion;
}
getProgressMonitor().worked(5);
if (getProgressMonitor().isCanceled()) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Update cancelled", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
return getProjectSpace().getBaseVersion();
}
@@ -121,9 +130,10 @@
checkAndRemoveDuplicateOperations(incomingChanges);
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Creating local change package", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
AbstractChangePackage copiedLocalChangedPackage = ChangePackageUtil.createChangePackage(
- Configuration.getClientBehavior().useInMemoryChangePackage()
- );
+ Configuration.getClientBehavior().useInMemoryChangePackage());
final ESCloseableIterable<AbstractOperation> operations = getProjectSpace().getLocalChangePackage()
.operations();
try {
@@ -133,6 +143,8 @@
} finally {
operations.close();
}
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Creating local change package..done", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
// build a mapping including deleted and create model elements in local and incoming change packages
final ModelElementIdToEObjectMappingImpl idToEObjectMapping = new ModelElementIdToEObjectMappingImpl(
@@ -158,17 +170,19 @@
getProjectSpace().toAPI(),
incomingAPIChangePackages,
idToEObjectMapping.toAPI())) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Update cancelled by user.", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
return getProjectSpace().getBaseVersion();
}
ESWorkspaceProviderImpl
- .getObserverBus()
- .notify(ESUpdateObserver.class, true)
- .inspectChanges(
- getProjectSpace().toAPI(),
- incomingAPIChangePackages,
- getProgressMonitor());
+ .getObserverBus()
+ .notify(ESUpdateObserver.class, true)
+ .inspectChanges(
+ getProjectSpace().toAPI(),
+ incomingAPIChangePackages,
+ getProgressMonitor());
if (!getProjectSpace().getLocalChangePackage().isEmpty()) {
final ChangeConflictSet changeConflictSet = calcConflicts(copiedLocalChangedPackage, incomingChanges,
@@ -195,12 +209,16 @@
getProgressMonitor().subTask(Messages.UpdateController_ApplyingChanges);
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Applying local changes", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
getProjectSpace().applyChanges(
resolvedVersion,
incomingChanges,
copiedLocalChangedPackage,
getProgressMonitor(),
true);
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Applying local changes..done", getProjectSpace(), //$NON-NLS-1$
+ version.getBranch(), getUsersession());
final Date now = new Date();
getProjectSpace().setLastUpdated(now);
@@ -209,6 +227,8 @@
.notify(ESUpdateObserver.class, true)
.updateCompleted(getProjectSpace().toAPI(), getProgressMonitor());
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Update completed", getProjectSpace(), version.getBranch(), //$NON-NLS-1$
+ getUsersession());
return getProjectSpace().getBaseVersion();
}
@@ -216,7 +236,8 @@
return resolvedVersion.compareTo(getProjectSpace().getBaseVersion()) == 0;
}
- private List<AbstractChangePackage> getIncomingChanges(final PrimaryVersionSpec resolvedVersion) throws ESException {
+ private List<AbstractChangePackage> getIncomingChanges(final PrimaryVersionSpec resolvedVersion)
+ throws ESException {
final List<AbstractChangePackage> changePackages = new UnknownEMFStoreWorkloadCommand<List<AbstractChangePackage>>(
getProgressMonitor()) {
@Override
@@ -237,10 +258,14 @@
}
private void checkAndRemoveDuplicateOperations(List<AbstractChangePackage> incomingChanges) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Check and remove duplicate operations..", //$NON-NLS-1$
+ getProjectSpace(), version.getBranch(), getUsersession());
final int baseVersionDelta = removeFromChangePackages(incomingChanges);
if (baseVersionDelta == 0) {
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Check and remove duplicate operations..done", //$NON-NLS-1$
+ getProjectSpace(), version.getBranch(), getUsersession());
return;
}
@@ -250,9 +275,11 @@
ModelUtil.logError(MessageFormat
.format(
Messages.UpdateController_ChangePackagesRemoved
- + Messages.UpdateController_PullingUpBaseVersion,
+ + Messages.UpdateController_PullingUpBaseVersion,
baseVersionDelta, baseVersion.getIdentifier(), baseVersion.getIdentifier() + baseVersionDelta));
getProjectSpace().save();
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX, "Check and remove duplicate operations..done", //$NON-NLS-1$
+ getProjectSpace(), version.getBranch(), getUsersession());
}
/**
@@ -289,7 +316,8 @@
* @param localChanges local change package
* @return <code>true</code> when all change packages have been consumed
*/
- public boolean removeDuplicateOperations(AbstractChangePackage incomingChanges, AbstractChangePackage localChanges) {
+ public boolean removeDuplicateOperations(AbstractChangePackage incomingChanges,
+ AbstractChangePackage localChanges) {
// TODO: cleanup this mess, ensure compatibility with in-memory change package
if (localChanges.size() == 0) {
@@ -297,8 +325,7 @@
}
final AbstractChangePackage tempChangePackage = ChangePackageUtil.createChangePackage(
- Configuration.getClientBehavior().useInMemoryChangePackage()
- );
+ Configuration.getClientBehavior().useInMemoryChangePackage());
final ESCloseableIterable<AbstractOperation> localOperations = localChanges.operations();
final ESCloseableIterable<AbstractOperation> incomingOps = incomingChanges.operations();
final int incomingOpsSize = incomingChanges.size();
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/exceptions/ServerUrlResolutionException.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/exceptions/ServerUrlResolutionException.java
index a02efcc..cbd22f2 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/exceptions/ServerUrlResolutionException.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/exceptions/ServerUrlResolutionException.java
@@ -19,8 +19,7 @@
@SuppressWarnings("serial")
public class ServerUrlResolutionException extends Exception {
- private static final String EXCEPTION_MESSAGE =
- Messages.ServerUrlResolutionException_ResolutionFailed;
+ private static final String EXCEPTION_MESSAGE = Messages.ServerUrlResolutionException_ResolutionFailed;
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadJob.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadJob.java
index 5d43da6..0968247 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadJob.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadJob.java
@@ -94,6 +94,10 @@
// download file chunk to retrieve filesize (file chunk is discarded)
FileChunk fileChunk = null;
fileChunk = getConnectionManager().downloadFileChunk(getSessionId(), getProjectId(), getFileInformation());
+ if (fileChunk == null) {
+ status.transferCancelled();
+ return false;
+ }
getFileInformation().setFileSize(fileChunk.getFileSize());
initializeMonitor(monitor);
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadStatus.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadStatus.java
index 28b8dbd..5b8a660 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadStatus.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadStatus.java
@@ -35,6 +35,7 @@
private final ProjectSpace transferringProjectSpace;
private final Observable finishedObservable = new Obs();
private final Observable failedObservable = new Obs();
+ private final Observable cancelledObservable = new Obs();
private final FileTransferStatistics statistics = new FileTransferStatistics(this);
private Status status;
@@ -55,7 +56,7 @@
*
* @author jfinis
*/
- public static enum Status {
+ public enum Status {
/**
* The file transfer was not yet started.
*/
@@ -127,6 +128,16 @@
}
}
+ private void addTransferCancelledObserver(Observer o) {
+ // Add
+ cancelledObservable.addObserver(o);
+
+ // Instantly notify if the transfer is already finished
+ if (status == Status.CANCELLED) {
+ o.update(cancelledObservable, this);
+ }
+ }
+
/**
* Adds an observer which is notified if the transfer fails due to an
* exception. The getException method can then be used to retrieve the
@@ -225,7 +236,6 @@
* in case of an error during transfer
*/
public File getTransferredFile(boolean block) throws FileTransferException {
-
if (!isTransferFinished() && block) {
/**
* TODO: Double-check this code
@@ -240,6 +250,7 @@
};
addTransferFailedObserver(observer);
addTransferFinishedObserver(observer);
+ addTransferCancelledObserver(observer);
try {
synchronized (observer) {
observer.wait();
@@ -279,6 +290,7 @@
}
statistics.registerStop();
status = Status.CANCELLED;
+ cancelledObservable.notifyObservers(this);
}
/**
@@ -356,7 +368,8 @@
* the file where the download can be found
* @return the created status object
*/
- public static FileDownloadStatus createAlreadyFinished(ProjectSpace p, FileIdentifier id, File transferredFile) {
+ public static FileDownloadStatus createAlreadyFinished(ProjectSpace p, FileIdentifier id,
+ File transferredFile) {
return new FileDownloadStatus(p, id, Status.FINISHED, transferredFile);
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileTransferManager.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileTransferManager.java
index 51ff274..efc6cdf 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileTransferManager.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileTransferManager.java
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceBase;
+import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreClientUtil;
import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreCommand;
import org.eclipse.emf.emfstore.internal.client.model.util.WorkspaceUtil;
import org.eclipse.emf.emfstore.internal.server.exceptions.FileTransferException;
@@ -35,6 +36,8 @@
*/
public class FileTransferManager {
+ private static final String LOGGING_PREFIX = "UPLOAD"; //$NON-NLS-1$
+
/**
* The associated cache manager.
*/
@@ -162,7 +165,8 @@
Messages.FileTransferManager_FileNoInCache_1
+ Messages.FileTransferManager_FileNoInCache_2
+ Messages.FileTransferManager_FileNoInCache_3,
- fi.getIdentifier()), null);
+ fi.getIdentifier()),
+ null);
// Remove from commit queue
new EMFStoreCommand() {
@Override
@@ -174,6 +178,8 @@
continue;
}
+ EMFStoreClientUtil.logProjectDetails(LOGGING_PREFIX,
+ MessageFormat.format("Uploading file with identifier {0}", fi.getIdentifier())); //$NON-NLS-1$
final FileUploadJob job = new FileUploadJob(this, fi, true);
final IStatus result = job.run(progress);
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelFactoryImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelFactoryImpl.java
index a589a33..6e91757 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelFactoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelFactoryImpl.java
@@ -38,16 +38,13 @@
* @generated
*/
public static ModelFactory init() {
- try
- {
+ try {
final ModelFactory theModelFactory = (ModelFactory) EPackage.Registry.INSTANCE
.getEFactory(ModelPackage.eNS_URI);
- if (theModelFactory != null)
- {
+ if (theModelFactory != null) {
return theModelFactory;
}
- } catch (final Exception exception)
- {
+ } catch (final Exception exception) {
EcorePlugin.INSTANCE.log(exception);
}
return new ModelFactoryImpl();
@@ -71,8 +68,7 @@
*/
@Override
public EObject create(EClass eClass) {
- switch (eClass.getClassifierID())
- {
+ switch (eClass.getClassifierID()) {
case ModelPackage.WORKSPACE:
return createWorkspace();
case ModelPackage.SERVER_INFO:
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelPackageImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelPackageImpl.java
index aef6ade..0f01c41 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ModelPackageImpl.java
@@ -103,8 +103,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -118,9 +119,9 @@
}
// Obtain or create and register package
- final ModelPackageImpl theModelPackage = (ModelPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new ModelPackageImpl());
+ final ModelPackageImpl theModelPackage = (ModelPackageImpl) (EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new ModelPackageImpl());
isInited = true;
@@ -227,14 +228,14 @@
*
* @generated
*/
- public EAttribute getServerInfo_Path()
- {
+ public EAttribute getServerInfo_Path() {
return (EAttribute) serverInfoEClass.getEStructuralFeatures().get(3);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
public EReference getServerInfo_ProjectInfos() {
@@ -720,201 +721,134 @@
projectSpaceEClass.getESuperTypes().add(theModelPackage_2.getIdentifiableElement());
// Initialize classes and features; add operations and parameters
- initEClass(workspaceEClass, Workspace.class,
- "Workspace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getWorkspace_ProjectSpaces(),
- getProjectSpace(),
- getProjectSpace_Workspace(),
- "projectSpaces", null, 0, -1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(workspaceEClass, Workspace.class, "Workspace", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getWorkspace_ProjectSpaces(), getProjectSpace(), getProjectSpace_Workspace(),
+ "projectSpaces", null, 0, -1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
getWorkspace_ProjectSpaces().getEKeys().add(theModelPackage_2.getIdentifiableElement_Identifier());
- initEReference(
- getWorkspace_ServerInfos(),
- getServerInfo(),
- null,
- "serverInfos", null, 0, -1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getWorkspace_Usersessions(),
- getUsersession(),
- null,
- "usersessions", null, 0, -1, Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getWorkspace_ServerInfos(), getServerInfo(), null, "serverInfos", null, 0, -1, //$NON-NLS-1$
+ Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getWorkspace_Usersessions(), getUsersession(), null, "usersessions", null, 0, -1, //$NON-NLS-1$
+ Workspace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(serverInfoEClass, ServerInfo.class,
- "ServerInfo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getServerInfo_Name(),
- ecorePackage.getEString(),
- "name", null, 1, 1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getServerInfo_Url(),
- ecorePackage.getEString(),
- "url", null, 1, 1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getServerInfo_Port(),
- ecorePackage.getEInt(),
- "port", null, 1, 1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getServerInfo_Path(),
- ecorePackage.getEString(),
- "path", null, 1, 1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getServerInfo_ProjectInfos(),
- theModelPackage_1.getProjectInfo(),
- null,
- "projectInfos", null, 0, -1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getServerInfo_LastUsersession(),
- getUsersession(),
- null,
- "lastUsersession", null, 0, 1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getServerInfo_CertificateAlias(),
- ecorePackage.getEString(),
- "certificateAlias", null, 1, 1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(serverInfoEClass, ServerInfo.class, "ServerInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getServerInfo_Name(), ecorePackage.getEString(), "name", null, 1, 1, ServerInfo.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getServerInfo_Url(), ecorePackage.getEString(), "url", null, 1, 1, ServerInfo.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getServerInfo_Port(), ecorePackage.getEInt(), "port", null, 1, 1, ServerInfo.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getServerInfo_Path(), ecorePackage.getEString(), "path", null, 1, 1, ServerInfo.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getServerInfo_ProjectInfos(), theModelPackage_1.getProjectInfo(), null, "projectInfos", null, 0, //$NON-NLS-1$
+ -1, ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getServerInfo_LastUsersession(), getUsersession(), null, "lastUsersession", null, 0, 1, //$NON-NLS-1$
+ ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getServerInfo_CertificateAlias(), ecorePackage.getEString(), "certificateAlias", null, 1, 1, //$NON-NLS-1$
+ ServerInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(usersessionEClass, Usersession.class,
- "Usersession", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getUsersession_Username(),
- ecorePackage.getEString(),
- "username", null, 0, 1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getUsersession_Password(),
- ecorePackage.getEString(),
- "password", null, 0, 1, Usersession.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getUsersession_SessionId(),
- theModelPackage_1.getSessionId(),
- null,
- "sessionId", null, 0, 1, Usersession.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getUsersession_PersistentPassword(),
- ecorePackage.getEString(),
- "persistentPassword", null, 0, 1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getUsersession_ServerInfo(),
- getServerInfo(),
- null,
- "serverInfo", null, 0, 1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getUsersession_SavePassword(),
- ecorePackage.getEBoolean(),
- "savePassword", null, 0, 1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getUsersession_ACUser(),
- theAccesscontrolPackage.getACUser(),
- null,
- "ACUser", null, 0, 1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getUsersession_ChangedProperties(),
- theAccesscontrolPackage.getOrgUnitProperty(),
- null,
- "changedProperties", null, 0, -1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(usersessionEClass, Usersession.class, "Usersession", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getUsersession_Username(), ecorePackage.getEString(), "username", null, 0, 1, Usersession.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getUsersession_Password(), ecorePackage.getEString(), "password", null, 0, 1, Usersession.class, //$NON-NLS-1$
+ IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getUsersession_SessionId(), theModelPackage_1.getSessionId(), null, "sessionId", null, 0, 1, //$NON-NLS-1$
+ Usersession.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getUsersession_PersistentPassword(), ecorePackage.getEString(), "persistentPassword", null, 0, 1, //$NON-NLS-1$
+ Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getUsersession_ServerInfo(), getServerInfo(), null, "serverInfo", null, 0, 1, //$NON-NLS-1$
+ Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getUsersession_SavePassword(), ecorePackage.getEBoolean(), "savePassword", null, 0, 1, //$NON-NLS-1$
+ Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getUsersession_ACUser(), theAccesscontrolPackage.getACUser(), null, "ACUser", null, 0, 1, //$NON-NLS-1$
+ Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getUsersession_ChangedProperties(), theAccesscontrolPackage.getOrgUnitProperty(), null,
+ "changedProperties", null, 0, -1, Usersession.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(projectSpaceEClass, ProjectSpace.class,
- "ProjectSpace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getProjectSpace_Project(),
- theModelPackage_2.getProject(),
- null,
- "project", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_ProjectId(),
- theModelPackage_1.getProjectId(),
- null,
- "projectId", null, 1, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getProjectSpace_ProjectName(),
- ecorePackage.getEString(),
- "projectName", null, 1, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getProjectSpace_ProjectDescription(),
- ecorePackage.getEString(),
- "projectDescription", null, 1, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_Usersession(),
- getUsersession(),
- null,
- "usersession", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getProjectSpace_LastUpdated(),
- ecorePackage.getEDate(),
- "lastUpdated", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_BaseVersion(),
- theVersioningPackage.getPrimaryVersionSpec(),
- null,
- "baseVersion", null, 1, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getProjectSpace_ResourceCount(),
- ecorePackage.getEInt(),
- "resourceCount", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getProjectSpace_Dirty(),
- ecorePackage.getEBoolean(),
- "dirty", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getProjectSpace_OldLogMessages(),
- ecorePackage.getEString(),
- "oldLogMessages", null, 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_WaitingUploads(),
- theModelPackage_1.getFileIdentifier(),
- null,
- "waitingUploads", null, 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_Properties(),
- theModelPackage_2.getEMFStoreProperty(),
- null,
- "properties", null, 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_ChangedSharedProperties(),
- theModelPackage_2.getEMFStoreProperty(),
- null,
- "changedSharedProperties", null, 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_Workspace(),
- getWorkspace(),
- getWorkspace_ProjectSpaces(),
- "workspace", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_LocalChangePackage(),
- theVersioningPackage.getAbstractChangePackage(),
- null,
- "localChangePackage", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getProjectSpace_MergedVersion(),
- theVersioningPackage.getPrimaryVersionSpec(),
- null,
- "mergedVersion", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(projectSpaceEClass, ProjectSpace.class, "ProjectSpace", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getProjectSpace_Project(), theModelPackage_2.getProject(), null, "project", null, 0, 1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_ProjectId(), theModelPackage_1.getProjectId(), null, "projectId", null, 1, 1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProjectSpace_ProjectName(), ecorePackage.getEString(), "projectName", null, 1, 1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProjectSpace_ProjectDescription(), ecorePackage.getEString(), "projectDescription", null, 1, //$NON-NLS-1$
+ 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_Usersession(), getUsersession(), null, "usersession", null, 0, 1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProjectSpace_LastUpdated(), ecorePackage.getEDate(), "lastUpdated", null, 0, 1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_BaseVersion(), theVersioningPackage.getPrimaryVersionSpec(), null, "baseVersion", //$NON-NLS-1$
+ null, 1, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProjectSpace_ResourceCount(), ecorePackage.getEInt(), "resourceCount", null, 0, 1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProjectSpace_Dirty(), ecorePackage.getEBoolean(), "dirty", null, 0, 1, ProjectSpace.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getProjectSpace_OldLogMessages(), ecorePackage.getEString(), "oldLogMessages", null, 0, -1, //$NON-NLS-1$
+ ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_WaitingUploads(), theModelPackage_1.getFileIdentifier(), null, "waitingUploads", //$NON-NLS-1$
+ null, 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_Properties(), theModelPackage_2.getEMFStoreProperty(), null, "properties", null, //$NON-NLS-1$
+ 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_ChangedSharedProperties(), theModelPackage_2.getEMFStoreProperty(), null,
+ "changedSharedProperties", null, 0, -1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_Workspace(), getWorkspace(), getWorkspace_ProjectSpaces(), "workspace", //$NON-NLS-1$
+ null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_LocalChangePackage(), theVersioningPackage.getAbstractChangePackage(), null,
+ "localChangePackage", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getProjectSpace_MergedVersion(), theVersioningPackage.getPrimaryVersionSpec(), null,
+ "mergedVersion", null, 0, 1, ProjectSpace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(pendingFileTransferEClass, PendingFileTransfer.class,
- "PendingFileTransfer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getPendingFileTransfer_AttachmentId(),
- theModelPackage_2.getModelElementId(),
- null,
- "attachmentId", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPendingFileTransfer_FileVersion(),
- ecorePackage.getEInt(),
- "fileVersion", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPendingFileTransfer_ChunkNumber(),
- ecorePackage.getEInt(),
- "chunkNumber", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPendingFileTransfer_Upload(),
- ecorePackage.getEBoolean(),
- "upload", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPendingFileTransfer_FileName(),
- ecorePackage.getEString(),
- "fileName", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPendingFileTransfer_PreliminaryFileName(),
- ecorePackage.getEString(),
- "preliminaryFileName", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(pendingFileTransferEClass, PendingFileTransfer.class, "PendingFileTransfer", !IS_ABSTRACT, //$NON-NLS-1$
+ !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPendingFileTransfer_AttachmentId(), theModelPackage_2.getModelElementId(), null,
+ "attachmentId", null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPendingFileTransfer_FileVersion(), ecorePackage.getEInt(), "fileVersion", null, 0, 1, //$NON-NLS-1$
+ PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPendingFileTransfer_ChunkNumber(), ecorePackage.getEInt(), "chunkNumber", null, 0, 1, //$NON-NLS-1$
+ PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPendingFileTransfer_Upload(), ecorePackage.getEBoolean(), "upload", null, 0, 1, //$NON-NLS-1$
+ PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPendingFileTransfer_FileName(), ecorePackage.getEString(), "fileName", null, 0, 1, //$NON-NLS-1$
+ PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPendingFileTransfer_PreliminaryFileName(), ecorePackage.getEString(), "preliminaryFileName", //$NON-NLS-1$
+ null, 0, 1, PendingFileTransfer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/OperationRecorder.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/OperationRecorder.java
index 0721b65..7eb8c61 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/OperationRecorder.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/OperationRecorder.java
@@ -414,10 +414,6 @@
for (int i = 0; i < allContainedModelElements.size(); i++) {
final EObject child = allContainedModelElements.get(i);
- if (ModelUtil.isIgnoredDatatype(child)) {
- continue;
- }
-
final EObject copiedChild = copiedAllContainedModelElements.get(i);
final ModelElementId childId = collection.getModelElementId(child);
@@ -426,8 +422,8 @@
createDeleteOperation.setModelElement(copiedElement);
createDeleteOperation.setModelElementId(collection.getModelElementId(modelElement));
-
createDeleteOperation.setClientDate(new Date());
+
return createDeleteOperation;
}
@@ -927,9 +923,7 @@
}
checkCommandConstraints(modelElement);
-
notificationRecorder.record(notification);
-
if (notificationRecorder.isRecordingComplete()) {
final List<AbstractOperation> ops = recordingFinished();
@@ -1078,7 +1072,7 @@
* @param setting
* a setting consisting of an {@link EObject} and a non-many reference
*/
- public SettingWithElementsToRemove(Setting setting) {
+ SettingWithElementsToRemove(Setting setting) {
this.setting = setting;
}
@@ -1090,7 +1084,7 @@
* @param elementsToRemove
* the elemets to be removed from the many reference
*/
- public SettingWithElementsToRemove(Setting setting, Set<EObject> elementsToRemove) {
+ SettingWithElementsToRemove(Setting setting, Set<EObject> elementsToRemove) {
this.setting = setting;
this.elementsToRemove.addAll(elementsToRemove);
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/PendingFileTransferImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/PendingFileTransferImpl.java
index e1cd54c..2fb1dd3 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/PendingFileTransferImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/PendingFileTransferImpl.java
@@ -25,20 +25,20 @@
* end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getAttachmentId <em>Attachment
- * Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getFileVersion <em>File
- * Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getChunkNumber <em>Chunk
- * Number</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#isUpload <em>Upload</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getFileName <em>File Name
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getPreliminaryFileName <em>
- * Preliminary File Name</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getAttachmentId
+ * <em>Attachment Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getFileVersion
+ * <em>File Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getChunkNumber
+ * <em>Chunk Number</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#isUpload <em>Upload</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getFileName <em>File Name</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl#getPreliminaryFileName
+ * <em>Preliminary File Name</em>}</li>
+ * </ul>
*
* @generated
*/
@@ -186,19 +186,16 @@
* @generated
*/
public ModelElementId getAttachmentId() {
- if (attachmentId != null && attachmentId.eIsProxy())
- {
+ if (attachmentId != null && attachmentId.eIsProxy()) {
final InternalEObject oldAttachmentId = (InternalEObject) attachmentId;
attachmentId = (ModelElementId) eResolveProxy(oldAttachmentId);
- if (attachmentId != oldAttachmentId)
- {
+ if (attachmentId != oldAttachmentId) {
final InternalEObject newAttachmentId = (InternalEObject) attachmentId;
- NotificationChain msgs = oldAttachmentId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, null);
- if (newAttachmentId.eInternalContainer() == null)
- {
- msgs = newAttachmentId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
+ NotificationChain msgs = oldAttachmentId.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, null);
+ if (newAttachmentId.eInternalContainer() == null) {
+ msgs = newAttachmentId.eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
}
if (msgs != null) {
msgs.dispatch();
@@ -229,8 +226,7 @@
public NotificationChain basicSetAttachmentId(ModelElementId newAttachmentId, NotificationChain msgs) {
final ModelElementId oldAttachmentId = attachmentId;
attachmentId = newAttachmentId;
- if (eNotificationRequired())
- {
+ if (eNotificationRequired()) {
final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, oldAttachmentId, newAttachmentId);
if (msgs == null) {
@@ -248,23 +244,21 @@
* @generated
*/
public void setAttachmentId(ModelElementId newAttachmentId) {
- if (newAttachmentId != attachmentId)
- {
+ if (newAttachmentId != attachmentId) {
NotificationChain msgs = null;
if (attachmentId != null) {
- msgs = ((InternalEObject) attachmentId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
+ msgs = ((InternalEObject) attachmentId).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
}
if (newAttachmentId != null) {
- msgs = ((InternalEObject) newAttachmentId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
+ msgs = ((InternalEObject) newAttachmentId).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
}
msgs = basicSetAttachmentId(newAttachmentId, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID,
newAttachmentId, newAttachmentId));
}
@@ -334,8 +328,8 @@
final boolean oldUpload = upload;
upload = newUpload;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__UPLOAD,
- oldUpload, upload));
+ eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__UPLOAD, oldUpload,
+ upload));
}
}
@@ -380,8 +374,9 @@
final String oldPreliminaryFileName = preliminaryFileName;
preliminaryFileName = newPreliminaryFileName;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET,
- ModelPackage.PENDING_FILE_TRANSFER__PRELIMINARY_FILE_NAME, oldPreliminaryFileName, preliminaryFileName));
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__PRELIMINARY_FILE_NAME,
+ oldPreliminaryFileName, preliminaryFileName));
}
}
@@ -392,8 +387,7 @@
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
return basicSetAttachmentId(null, msgs);
}
@@ -407,8 +401,7 @@
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
if (resolve) {
return getAttachmentId();
@@ -435,8 +428,7 @@
*/
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
setAttachmentId((ModelElementId) newValue);
return;
@@ -466,8 +458,7 @@
*/
@Override
public void eUnset(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
setAttachmentId((ModelElementId) null);
return;
@@ -497,8 +488,7 @@
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
return attachmentId != null;
case ModelPackage.PENDING_FILE_TRANSFER__FILE_VERSION:
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceBase.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceBase.java
index 74d9d65..525d48d 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceBase.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceBase.java
@@ -252,7 +252,7 @@
*/
public void applyChanges(PrimaryVersionSpec baseSpec, List<AbstractChangePackage> incomingChangePackages,
AbstractChangePackage myChanges, IProgressMonitor progressMonitor, boolean runChecksumCheckOnBaseSpec)
- throws ESException {
+ throws ESException {
// revert local changes
notifyPreRevertMyChanges(getLocalChangePackage());
@@ -288,7 +288,7 @@
private void runChecksumTests(PrimaryVersionSpec baseSpec, List<AbstractChangePackage> incomingChangePackages,
IProgressMonitor progressMonitor)
- throws ESException {
+ throws ESException {
progressMonitor.subTask(Messages.ProjectSpaceBase_Computing_Checksum);
@@ -1030,7 +1030,7 @@
*/
public void mergeBranch(final PrimaryVersionSpec branchSpec, final ConflictResolver conflictResolver,
final IProgressMonitor monitor)
- throws ESException {
+ throws ESException {
if (branchSpec == null || conflictResolver == null) {
throw new IllegalArgumentException(Messages.ProjectSpaceBase_Arguments_Must_Not_Be_Null);
@@ -1076,7 +1076,7 @@
*/
public AbstractChangePackage mergeResolvedConflicts(ChangeConflictSet conflictSet,
List<AbstractChangePackage> myChangePackages, List<AbstractChangePackage> theirChangePackages)
- throws ChangeConflictException {
+ throws ChangeConflictException {
final Set<AbstractOperation> accceptedMineSet = new LinkedHashSet<AbstractOperation>();
final Set<AbstractOperation> rejectedTheirsSet = new LinkedHashSet<AbstractOperation>();
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceImpl.java
index aeedfdc..0741943 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ProjectSpaceImpl.java
@@ -562,8 +562,8 @@
case ModelPackage.PROJECT_SPACE__PROJECT_NAME:
return PROJECT_NAME_EDEFAULT == null ? projectName != null : !PROJECT_NAME_EDEFAULT.equals(projectName);
case ModelPackage.PROJECT_SPACE__PROJECT_DESCRIPTION:
- return PROJECT_DESCRIPTION_EDEFAULT == null ? projectDescription != null : !PROJECT_DESCRIPTION_EDEFAULT
- .equals(projectDescription);
+ return PROJECT_DESCRIPTION_EDEFAULT == null ? projectDescription != null
+ : !PROJECT_DESCRIPTION_EDEFAULT.equals(projectDescription);
case ModelPackage.PROJECT_SPACE__USERSESSION:
return usersession != null;
case ModelPackage.PROJECT_SPACE__LAST_UPDATED:
@@ -738,11 +738,11 @@
baseVersion = (PrimaryVersionSpec) eResolveProxy(oldBaseVersion);
if (baseVersion != oldBaseVersion) {
final InternalEObject newBaseVersion = (InternalEObject) baseVersion;
- NotificationChain msgs = oldBaseVersion.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, null);
+ NotificationChain msgs = oldBaseVersion.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, null);
if (newBaseVersion.eInternalContainer() == null) {
- msgs = newBaseVersion.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, msgs);
+ msgs = newBaseVersion.eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, msgs);
}
if (msgs != null) {
msgs.dispatch();
@@ -802,8 +802,8 @@
project = (Project) eResolveProxy(oldProject);
if (project != oldProject) {
final InternalEObject newProject = (InternalEObject) project;
- NotificationChain msgs = oldProject.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT, null, null);
+ NotificationChain msgs = oldProject.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT, null, null);
if (newProject.eInternalContainer() == null) {
msgs = newProject.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT,
null, msgs);
@@ -840,11 +840,11 @@
projectId = (ProjectId) eResolveProxy(oldProjectId);
if (projectId != oldProjectId) {
final InternalEObject newProjectId = (InternalEObject) projectId;
- NotificationChain msgs = oldProjectId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, null);
+ NotificationChain msgs = oldProjectId.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, null);
if (newProjectId.eInternalContainer() == null) {
- msgs = newProjectId.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, msgs);
+ msgs = newProjectId.eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, msgs);
}
if (msgs != null) {
msgs.dispatch();
@@ -952,12 +952,12 @@
if (newBaseVersion != baseVersion) {
NotificationChain msgs = null;
if (baseVersion != null) {
- msgs = ((InternalEObject) baseVersion).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, msgs);
+ msgs = ((InternalEObject) baseVersion).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, msgs);
}
if (newBaseVersion != null) {
- msgs = ((InternalEObject) newBaseVersion).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, msgs);
+ msgs = ((InternalEObject) newBaseVersion).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__BASE_VERSION, null, msgs);
}
msgs = basicSetBaseVersion(newBaseVersion, msgs);
if (msgs != null) {
@@ -1005,12 +1005,12 @@
if (newProject != project) {
NotificationChain msgs = null;
if (project != null) {
- msgs = ((InternalEObject) project).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT, null, msgs);
+ msgs = ((InternalEObject) project).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT, null, msgs);
}
if (newProject != null) {
- msgs = ((InternalEObject) newProject).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT, null, msgs);
+ msgs = ((InternalEObject) newProject).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT, null, msgs);
}
msgs = basicSetProject(newProject, msgs);
if (msgs != null) {
@@ -1045,12 +1045,12 @@
if (newProjectId != projectId) {
NotificationChain msgs = null;
if (projectId != null) {
- msgs = ((InternalEObject) projectId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, msgs);
+ msgs = ((InternalEObject) projectId).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, msgs);
}
if (newProjectId != null) {
- msgs = ((InternalEObject) newProjectId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, msgs);
+ msgs = ((InternalEObject) newProjectId).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__PROJECT_ID, null, msgs);
}
msgs = basicSetProjectId(newProjectId, msgs);
if (msgs != null) {
@@ -1146,11 +1146,11 @@
localChangePackage = (AbstractChangePackage) eResolveProxy(oldLocalChangePackage);
if (localChangePackage != oldLocalChangePackage) {
final InternalEObject newLocalChangePackage = (InternalEObject) localChangePackage;
- NotificationChain msgs = oldLocalChangePackage.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, null);
+ NotificationChain msgs = oldLocalChangePackage.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, null);
if (newLocalChangePackage.eInternalContainer() == null) {
- msgs = newLocalChangePackage.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
+ msgs = newLocalChangePackage.eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
}
if (msgs != null) {
msgs.dispatch();
@@ -1206,12 +1206,12 @@
if (newLocalChangePackage != localChangePackage) {
NotificationChain msgs = null;
if (localChangePackage != null) {
- msgs = ((InternalEObject) localChangePackage).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
+ msgs = ((InternalEObject) localChangePackage).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
}
if (newLocalChangePackage != null) {
- msgs = ((InternalEObject) newLocalChangePackage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
+ msgs = ((InternalEObject) newLocalChangePackage).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
}
msgs = basicSetLocalChangePackage(newLocalChangePackage, msgs);
if (msgs != null) {
@@ -1235,11 +1235,11 @@
mergedVersion = (PrimaryVersionSpec) eResolveProxy(oldMergedVersion);
if (mergedVersion != oldMergedVersion) {
final InternalEObject newMergedVersion = (InternalEObject) mergedVersion;
- NotificationChain msgs = oldMergedVersion.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, null);
+ NotificationChain msgs = oldMergedVersion.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, null);
if (newMergedVersion.eInternalContainer() == null) {
- msgs = newMergedVersion.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, msgs);
+ msgs = newMergedVersion.eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, msgs);
}
if (msgs != null) {
msgs.dispatch();
@@ -1294,12 +1294,12 @@
if (newMergedVersion != mergedVersion) {
NotificationChain msgs = null;
if (mergedVersion != null) {
- msgs = ((InternalEObject) mergedVersion).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, msgs);
+ msgs = ((InternalEObject) mergedVersion).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, msgs);
}
if (newMergedVersion != null) {
- msgs = ((InternalEObject) newMergedVersion).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, msgs);
+ msgs = ((InternalEObject) newMergedVersion).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.PROJECT_SPACE__MERGED_VERSION, null, msgs);
}
msgs = basicSetMergedVersion(newMergedVersion, msgs);
if (msgs != null) {
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ServerInfoImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ServerInfoImpl.java
index 6bc48fc..8d66eac 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ServerInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/ServerInfoImpl.java
@@ -33,6 +33,7 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getUrl <em>Url</em>}</li>
@@ -40,12 +41,11 @@
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getPath <em>Path</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getProjectInfos <em>Project Infos</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getLastUsersession <em>Last Usersession
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getCertificateAlias <em>Certificate
- * Alias</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getLastUsersession
+ * <em>Last Usersession</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl#getCertificateAlias
+ * <em>Certificate Alias</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -119,6 +119,7 @@
* The default value of the '{@link #getPath() <em>Path</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @see #getPath()
* @generated
* @ordered
@@ -128,6 +129,7 @@
* The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @see #getPath()
* @generated
* @ordered
@@ -262,24 +264,25 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
- public String getPath()
- {
+ public String getPath() {
return path;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ *
* @generated
*/
- public void setPath(String newPath)
- {
- String oldPath = path;
+ public void setPath(String newPath) {
+ final String oldPath = path;
path = newPath;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVER_INFO__PATH, oldPath, path));
+ }
}
/**
@@ -288,8 +291,7 @@
* @generated
*/
public EList<ProjectInfo> getProjectInfos() {
- if (projectInfos == null)
- {
+ if (projectInfos == null) {
projectInfos = new EObjectContainmentEList.Resolving<ProjectInfo>(ProjectInfo.class, this,
ModelPackage.SERVER_INFO__PROJECT_INFOS);
}
@@ -302,12 +304,10 @@
* @generated
*/
public Usersession getLastUsersession() {
- if (lastUsersession != null && lastUsersession.eIsProxy())
- {
+ if (lastUsersession != null && lastUsersession.eIsProxy()) {
final InternalEObject oldLastUsersession = (InternalEObject) lastUsersession;
lastUsersession = (Usersession) eResolveProxy(oldLastUsersession);
- if (lastUsersession != oldLastUsersession)
- {
+ if (lastUsersession != oldLastUsersession) {
if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE,
ModelPackage.SERVER_INFO__LAST_USERSESSION, oldLastUsersession, lastUsersession));
@@ -370,8 +370,7 @@
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.SERVER_INFO__PROJECT_INFOS:
return ((InternalEList<?>) getProjectInfos()).basicRemove(otherEnd, msgs);
}
@@ -385,8 +384,7 @@
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.SERVER_INFO__NAME:
return getName();
case ModelPackage.SERVER_INFO__URL:
@@ -416,8 +414,7 @@
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.SERVER_INFO__NAME:
setName((String) newValue);
return;
@@ -451,8 +448,7 @@
*/
@Override
public void eUnset(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.SERVER_INFO__NAME:
setName(NAME_EDEFAULT);
return;
@@ -485,8 +481,7 @@
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.SERVER_INFO__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
case ModelPackage.SERVER_INFO__URL:
@@ -500,8 +495,8 @@
case ModelPackage.SERVER_INFO__LAST_USERSESSION:
return lastUsersession != null;
case ModelPackage.SERVER_INFO__CERTIFICATE_ALIAS:
- return CERTIFICATE_ALIAS_EDEFAULT == null ? certificateAlias != null : !CERTIFICATE_ALIAS_EDEFAULT
- .equals(certificateAlias);
+ return CERTIFICATE_ALIAS_EDEFAULT == null ? certificateAlias != null
+ : !CERTIFICATE_ALIAS_EDEFAULT.equals(certificateAlias);
}
return super.eIsSet(featureID);
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/UsersessionImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/UsersessionImpl.java
index ffae2ec..ec5e007 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/UsersessionImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/UsersessionImpl.java
@@ -45,20 +45,21 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Usersession</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getUsername <em>Username</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getPassword <em>Password</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getSessionId <em>Session Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getPersistentPassword <em>Persistent
- * Password</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getServerInfo <em>Server Info</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getPersistentPassword
+ * <em>Persistent Password</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getServerInfo <em>Server Info</em>}
+ * </li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#isSavePassword <em>Save Password</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getACUser <em>AC User</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getChangedProperties <em>Changed
- * Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl#getChangedProperties
+ * <em>Changed Properties</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -304,12 +305,10 @@
* @generated
*/
public SessionId getSessionIdGen() {
- if (sessionId != null && sessionId.eIsProxy())
- {
+ if (sessionId != null && sessionId.eIsProxy()) {
final InternalEObject oldSessionId = (InternalEObject) sessionId;
sessionId = (SessionId) eResolveProxy(oldSessionId);
- if (sessionId != oldSessionId)
- {
+ if (sessionId != oldSessionId) {
if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.USERSESSION__SESSION_ID,
oldSessionId, sessionId));
@@ -383,12 +382,10 @@
* @generated
*/
public ServerInfo getServerInfo() {
- if (serverInfo != null && serverInfo.eIsProxy())
- {
+ if (serverInfo != null && serverInfo.eIsProxy()) {
final InternalEObject oldServerInfo = (InternalEObject) serverInfo;
serverInfo = (ServerInfo) eResolveProxy(oldServerInfo);
- if (serverInfo != oldServerInfo)
- {
+ if (serverInfo != oldServerInfo) {
if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.USERSESSION__SERVER_INFO,
oldServerInfo, serverInfo));
@@ -470,19 +467,16 @@
* @generated
*/
public ACUser getACUser() {
- if (acUser != null && acUser.eIsProxy())
- {
+ if (acUser != null && acUser.eIsProxy()) {
final InternalEObject oldACUser = (InternalEObject) acUser;
acUser = (ACUser) eResolveProxy(oldACUser);
- if (acUser != oldACUser)
- {
+ if (acUser != oldACUser) {
final InternalEObject newACUser = (InternalEObject) acUser;
- NotificationChain msgs = oldACUser.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.USERSESSION__AC_USER, null, null);
- if (newACUser.eInternalContainer() == null)
- {
- msgs = newACUser.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.USERSESSION__AC_USER,
- null, msgs);
+ NotificationChain msgs = oldACUser.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.USERSESSION__AC_USER, null, null);
+ if (newACUser.eInternalContainer() == null) {
+ msgs = newACUser.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.USERSESSION__AC_USER, null,
+ msgs);
}
if (msgs != null) {
msgs.dispatch();
@@ -513,8 +507,7 @@
public NotificationChain basicSetACUser(ACUser newACUser, NotificationChain msgs) {
final ACUser oldACUser = acUser;
acUser = newACUser;
- if (eNotificationRequired())
- {
+ if (eNotificationRequired()) {
final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
ModelPackage.USERSESSION__AC_USER, oldACUser, newACUser);
if (msgs == null) {
@@ -532,25 +525,23 @@
* @generated
*/
public void setACUser(ACUser newACUser) {
- if (newACUser != acUser)
- {
+ if (newACUser != acUser) {
NotificationChain msgs = null;
if (acUser != null) {
- msgs = ((InternalEObject) acUser).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.USERSESSION__AC_USER, null, msgs);
+ msgs = ((InternalEObject) acUser).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.USERSESSION__AC_USER, null, msgs);
}
if (newACUser != null) {
- msgs = ((InternalEObject) newACUser).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.USERSESSION__AC_USER, null, msgs);
+ msgs = ((InternalEObject) newACUser).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.USERSESSION__AC_USER, null, msgs);
}
msgs = basicSetACUser(newACUser, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__AC_USER, newACUser,
- newACUser));
+ } else if (eNotificationRequired()) {
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__AC_USER, newACUser, newACUser));
}
}
@@ -560,8 +551,7 @@
* @generated
*/
public EList<OrgUnitProperty> getChangedProperties() {
- if (changedProperties == null)
- {
+ if (changedProperties == null) {
changedProperties = new EObjectContainmentEList.Resolving<OrgUnitProperty>(OrgUnitProperty.class, this,
ModelPackage.USERSESSION__CHANGED_PROPERTIES);
}
@@ -629,8 +619,7 @@
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.USERSESSION__AC_USER:
return basicSetACUser(null, msgs);
case ModelPackage.USERSESSION__CHANGED_PROPERTIES:
@@ -647,8 +636,7 @@
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.USERSESSION__USERNAME:
return getUsername();
case ModelPackage.USERSESSION__PASSWORD:
@@ -686,8 +674,7 @@
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.USERSESSION__USERNAME:
setUsername((String) newValue);
return;
@@ -724,8 +711,7 @@
*/
@Override
public void eUnset(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.USERSESSION__USERNAME:
setUsername(USERNAME_EDEFAULT);
return;
@@ -761,8 +747,7 @@
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.USERSESSION__USERNAME:
return USERNAME_EDEFAULT == null ? username != null : !USERNAME_EDEFAULT.equals(username);
case ModelPackage.USERSESSION__PASSWORD:
@@ -770,8 +755,8 @@
case ModelPackage.USERSESSION__SESSION_ID:
return sessionId != null;
case ModelPackage.USERSESSION__PERSISTENT_PASSWORD:
- return PERSISTENT_PASSWORD_EDEFAULT == null ? persistentPassword != null : !PERSISTENT_PASSWORD_EDEFAULT
- .equals(persistentPassword);
+ return PERSISTENT_PASSWORD_EDEFAULT == null ? persistentPassword != null
+ : !PERSISTENT_PASSWORD_EDEFAULT.equals(persistentPassword);
case ModelPackage.USERSESSION__SERVER_INFO:
return serverInfo != null;
case ModelPackage.USERSESSION__SAVE_PASSWORD:
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/WorkspaceImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/WorkspaceImpl.java
index 50b9dca..4a84ad4 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/WorkspaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/WorkspaceImpl.java
@@ -32,8 +32,10 @@
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl#getProjectSpaces <em>Project Spaces
* </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl#getServerInfos <em>Server Infos</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl#getUsersessions <em>Usersessions </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl#getServerInfos <em>Server Infos</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl#getUsersessions <em>Usersessions </em>}
+ * </li>
* </ul>
* </p>
*
@@ -88,8 +90,7 @@
*/
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
return getProjectSpaces();
case ModelPackage.WORKSPACE__SERVER_INFOS:
@@ -109,8 +110,7 @@
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
return ((InternalEList<InternalEObject>) (InternalEList<?>) getProjectSpaces()).basicAdd(otherEnd, msgs);
}
@@ -124,8 +124,7 @@
*/
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
return ((InternalEList<?>) getProjectSpaces()).basicRemove(otherEnd, msgs);
case ModelPackage.WORKSPACE__SERVER_INFOS:
@@ -143,8 +142,7 @@
*/
@Override
public boolean eIsSet(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
return projectSpaces != null && !projectSpaces.isEmpty();
case ModelPackage.WORKSPACE__SERVER_INFOS:
@@ -163,8 +161,7 @@
@SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
getProjectSpaces().clear();
getProjectSpaces().addAll((Collection<? extends ProjectSpace>) newValue);
@@ -198,8 +195,7 @@
*/
@Override
public void eUnset(int featureID) {
- switch (featureID)
- {
+ switch (featureID) {
case ModelPackage.WORKSPACE__PROJECT_SPACES:
getProjectSpaces().clear();
return;
@@ -219,8 +215,7 @@
* @generated
*/
public EList<ProjectSpace> getProjectSpaces() {
- if (projectSpaces == null)
- {
+ if (projectSpaces == null) {
projectSpaces = new EObjectContainmentWithInverseEList.Resolving<ProjectSpace>(ProjectSpace.class, this,
ModelPackage.WORKSPACE__PROJECT_SPACES, ModelPackage.PROJECT_SPACE__WORKSPACE);
}
@@ -233,8 +228,7 @@
* @generated
*/
public EList<ServerInfo> getServerInfos() {
- if (serverInfos == null)
- {
+ if (serverInfos == null) {
serverInfos = new EObjectContainmentEList.Resolving<ServerInfo>(ServerInfo.class, this,
ModelPackage.WORKSPACE__SERVER_INFOS);
}
@@ -247,8 +241,7 @@
* @generated
*/
public EList<Usersession> getUsersessions() {
- if (usersessions == null)
- {
+ if (usersessions == null) {
usersessions = new EObjectContainmentEList.Resolving<Usersession>(Usersession.class, this,
ModelPackage.WORKSPACE__USERSESSIONS);
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/DefaultCopier.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/DefaultCopier.java
new file mode 100644
index 0000000..69e2d7c
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/DefaultCopier.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.internal.client.model.impl.api;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
+import org.eclipse.emf.emfstore.client.util.ESCopier;
+
+/**
+ * The default {@link ESCopier} that does not copy by using
+ * original references.
+ *
+ */
+public class DefaultCopier implements ESCopier {
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.client.util.ESCopier#shouldHandle(org.eclipse.emf.ecore.EObject)
+ */
+ public int shouldHandle(EObject eObject) {
+ return 0;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.client.util.ESCopier#copy(org.eclipse.emf.ecore.EObject)
+ */
+ public EObject copy(EObject eObject) {
+ final Copier copier = new Copier(true, false);
+ final EObject copiedElement = copier.copy(eObject);
+ copier.copyReferences();
+ return copiedElement;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESLocalProjectImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESLocalProjectImpl.java
index f4a5f1e..2238501 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESLocalProjectImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESLocalProjectImpl.java
@@ -427,7 +427,7 @@
*/
public ESPrimaryVersionSpec commitToBranch(final ESBranchVersionSpec branch, final String logMessage,
final ESCommitCallback callback, final IProgressMonitor monitor) throws InvalidVersionSpecException,
- ESUpdateRequiredException, ESException {
+ ESUpdateRequiredException, ESException {
final PrimaryVersionSpec versionSpec = RunESCommand.WithException.runWithResult(ESException.class,
new Callable<PrimaryVersionSpec>() {
@@ -476,7 +476,7 @@
*/
public ESPrimaryVersionSpec update(ESVersionSpec versionSpec, final ESUpdateCallback callback,
final IProgressMonitor monitor)
- throws ChangeConflictException, ESException {
+ throws ChangeConflictException, ESException {
final VersionSpec version;
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESRemoteProjectImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESRemoteProjectImpl.java
index 182d50e..34e74d2 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESRemoteProjectImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESRemoteProjectImpl.java
@@ -216,11 +216,10 @@
*/
public List<ESHistoryInfo> getHistoryInfos(final ESHistoryQuery<? extends ESHistoryQuery<?>> query,
IProgressMonitor monitor)
- throws ESException {
+ throws ESException {
@SuppressWarnings("unchecked")
- final ESHistoryQueryImpl<ESHistoryQuery<? extends ESHistoryQuery<?>>, ?> queryImpl =
- (ESHistoryQueryImpl<ESHistoryQuery<? extends ESHistoryQuery<?>>, ?>) query;
+ final ESHistoryQueryImpl<ESHistoryQuery<? extends ESHistoryQuery<?>>, ?> queryImpl = (ESHistoryQueryImpl<ESHistoryQuery<? extends ESHistoryQuery<?>>, ?>) query;
return APIUtil.mapToAPI(ESHistoryInfo.class, new ServerCall<List<HistoryInfo>>(getServerInfo(), monitor) {
@Override
@@ -242,7 +241,7 @@
*/
public List<ESHistoryInfo> getHistoryInfos(final ESUsersession session,
final ESHistoryQuery<? extends ESHistoryQuery<?>> query,
- final IProgressMonitor monitor) throws ESException {
+ final IProgressMonitor monitor) throws ESException {
return RunESCommand.WithException.runWithResult(ESException.class, new Callable<List<ESHistoryInfo>>() {
public List<ESHistoryInfo> call() throws Exception {
@@ -276,7 +275,7 @@
*/
public void addTag(final ESPrimaryVersionSpec primaryVersionSpec, final ESTagVersionSpec tagVersionSpec,
final IProgressMonitor monitor)
- throws ESException {
+ throws ESException {
final ESPrimaryVersionSpecImpl primaryVersionSpecImpl = (ESPrimaryVersionSpecImpl) primaryVersionSpec;
final ESTagVersionSpecImpl tagVersionSpecImpl = (ESTagVersionSpecImpl) tagVersionSpec;
@@ -308,7 +307,7 @@
*/
public void removeTag(final ESPrimaryVersionSpec versionSpec, final ESTagVersionSpec tag,
final IProgressMonitor monitor)
- throws ESException {
+ throws ESException {
final ESPrimaryVersionSpecImpl versionSpecImpl = (ESPrimaryVersionSpecImpl) versionSpec;
final ESTagVersionSpecImpl tagVersionSpecImpl = (ESTagVersionSpecImpl) tag;
@@ -362,7 +361,7 @@
*/
public ESLocalProjectImpl checkout(final String name, final ESUsersession usersession,
final IProgressMonitor monitor)
- throws ESException {
+ throws ESException {
return RunESCommand.WithException.runWithResult(ESException.class, new Callable<ESLocalProjectImpl>() {
public ESLocalProjectImpl call() throws Exception {
final ESPrimaryVersionSpec primaryVersionSpec = resolveVersionSpec(usersession, Versions.createHEAD()
@@ -434,11 +433,11 @@
*/
public ESLocalProjectImpl checkout(final String name, final ESUsersession session,
final ESPrimaryVersionSpec versionSpec, final IProgressMonitor progressMonitor)
- throws ESException {
+ throws ESException {
final ESLocalProjectImpl project = fetch(name, session, versionSpec, progressMonitor);
project.addToWorkspace(progressMonitor);
ESWorkspaceProviderImpl.getObserverBus().notify(ESCheckoutObserver.class)
- .checkoutDone(project);
+ .checkoutDone(project);
return project;
}
@@ -476,9 +475,9 @@
RunESCommand.WithException.run(ESException.class, new Callable<Void>() {
public Void call() throws Exception {
getDeleteProjectServerCall()
- .setProgressMonitor(monitor)
- .setServer(getServerInfo())
- .execute();
+ .setProgressMonitor(monitor)
+ .setServer(getServerInfo())
+ .execute();
return null;
}
});
@@ -496,9 +495,9 @@
RunESCommand.WithException.run(ESException.class, new Callable<Void>() {
public Void call() throws Exception {
getDeleteProjectServerCall()
- .setProgressMonitor(monitor)
- .setUsersession(usersession)
- .execute();
+ .setProgressMonitor(monitor)
+ .setUsersession(usersession)
+ .execute();
return null;
}
});
@@ -565,10 +564,10 @@
if (canDeleteFiles(user, getProjectInfo().getProjectId())) {
getConnectionManager()
- .deleteProject(getSessionId(), getProjectInfo().getProjectId(), true);
+ .deleteProject(getSessionId(), getProjectInfo().getProjectId(), true);
} else {
getConnectionManager()
- .deleteProject(getSessionId(), getProjectInfo().getProjectId(), false);
+ .deleteProject(getSessionId(), getProjectInfo().getProjectId(), false);
}
return null;
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESServerImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESServerImpl.java
index 248919f..9de605d 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESServerImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESServerImpl.java
@@ -236,8 +236,7 @@
usersession.setPassword(password);
final ESUsersessionImpl esSession = usersession.toAPI();
- final EMFStoreCommandWithException<ESException> cmd =
- new EMFStoreCommandWithException<ESException>() {
+ final EMFStoreCommandWithException<ESException> cmd = new EMFStoreCommandWithException<ESException>() {
@Override
protected void doRun() {
workspace.toInternalAPI().getUsersessions().add(usersession);
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESWorkspaceImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESWorkspaceImpl.java
index d9cce60..2677652 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESWorkspaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/api/ESWorkspaceImpl.java
@@ -38,7 +38,7 @@
*
* @author emueller
*/
-public class ESWorkspaceImpl extends AbstractAPIImpl<ESWorkspaceImpl, Workspace>implements ESWorkspace {
+public class ESWorkspaceImpl extends AbstractAPIImpl<ESWorkspaceImpl, Workspace> implements ESWorkspace {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ChecksumErrorHandler.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ChecksumErrorHandler.java
index a0d6104..1af60d4 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ChecksumErrorHandler.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ChecksumErrorHandler.java
@@ -71,46 +71,25 @@
*/
public boolean execute(ESLocalProject localProject, ESPrimaryVersionSpec versionSpec, IProgressMonitor monitor)
throws ESException {
- WorkspaceUtil.logWarning("Checksum comparison failed.", null); //$NON-NLS-1$
-
- final Project project = ESLocalProjectImpl.class.cast(localProject).toInternalAPI().getProject();
- final ESLocalProject serverESProject = localProject
- .getRemoteProject()
- .checkout(
- "log_error_checksum_debug_checkout", localProject.getUsersession(), versionSpec, new NullProgressMonitor()); //$NON-NLS-1$
- final Project serverProject = ESLocalProjectImpl.class.cast(serverESProject).toInternalAPI()
- .getProject();
- try {
-
- final Map<Object, Object> formatOptions = new LinkedHashMap<Object, Object>();
- formatOptions.put(XMLResource.OPTION_DECLARE_XML, Boolean.TRUE);
- formatOptions.put(XMLResource.OPTION_FORMATTED, Boolean.TRUE);
-
- final String localSerialization = ModelUtil
- .eObjectToString(project, ModelUtil.getResourceSaveOptions());
- final String serverSerialization = ModelUtil.eObjectToString(serverProject,
- ModelUtil.getResourceSaveOptions());
-
- serverESProject.delete(new NullProgressMonitor());
-
- final File localFile = Activator.getDefault().getBundle().getDataFile("localProjectSerialization.txt"); //$NON-NLS-1$
- final File serverFile = Activator.getDefault().getBundle()
- .getDataFile("serverProjectSerialization.txt"); //$NON-NLS-1$
-
- final FileWriter fileWriterLocal = new FileWriter(localFile);
- fileWriterLocal.write(localSerialization);
- fileWriterLocal.close();
- final FileWriter fileWriterServer = new FileWriter(serverFile);
- fileWriterServer.write(serverSerialization);
- fileWriterServer.close();
- } catch (final SerializationException ex) {
- WorkspaceUtil.logException("Couldn't log the serializations.", ex); //$NON-NLS-1$
- } catch (final IOException ex) {
- WorkspaceUtil.logException("Couldn't save the serializations.", ex); //$NON-NLS-1$
- }
- return true;
+ return LogDetailed.execute(localProject, versionSpec, monitor, false);
}
+ },
+ /**
+ * Logs the checksum comparison failure detailed: the serialization of both project spaces is written in seperate
+ * files. The execution of the caller will then be discontinued.
+ */
+ LOG_DETAILED_AND_CANCEL
+
+ {
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean execute(ESLocalProject localProject, ESPrimaryVersionSpec versionSpec, IProgressMonitor monitor)
+ throws ESException {
+ return LogDetailed.execute(localProject, versionSpec, monitor, true);
+ }
},
/**
@@ -147,18 +126,13 @@
public Project run(IProgressMonitor monitor) throws ESException {
final ESSessionIdImpl sessionIdImpl = (ESSessionIdImpl) project.getUsersession().getSessionId();
- final ESGlobalProjectIdImpl globalProjectIdImpl = (ESGlobalProjectIdImpl) project
- .getRemoteProject()
+ final ESGlobalProjectIdImpl globalProjectIdImpl = (ESGlobalProjectIdImpl) project.getRemoteProject()
.getGlobalProjectId();
final ESVersionSpecImpl<?, ? extends VersionSpec> versionSpecImpl = (ESVersionSpecImpl<?, ?>) versionSpec;
- return ESWorkspaceProviderImpl
- .getInstance()
- .getConnectionManager()
- .getProject(
- sessionIdImpl.toInternalAPI(),
- globalProjectIdImpl.toInternalAPI(),
- ModelUtil.clone(versionSpecImpl.toInternalAPI()));
+ return ESWorkspaceProviderImpl.getInstance().getConnectionManager().getProject(
+ sessionIdImpl.toInternalAPI(), globalProjectIdImpl.toInternalAPI(),
+ ModelUtil.clone(versionSpecImpl.toInternalAPI()));
}
}.execute();
@@ -180,3 +154,70 @@
}
}
}
+
+/**
+ * Logs the checksum comparison failure detailed: the serialization of both project spaces is written in separate
+ * files.
+ */
+final class LogDetailed {
+
+ private LogDetailed() {
+ // private ctor
+ }
+
+ /**
+ * Execute the detailed comparison.
+ *
+ * @param localProject the {@link ESLocalProject} whose contents should be checked
+ * @param versionSpec the version for which the comparison should be checked
+ * @param monitor a {@link IProgressMonitor} instance
+ * @param shouldFail whether to continue with in case the comparison failed
+ * @return the inverse of {@code shouldFail} meaning that we indicate an error occurred
+ * in case the comparison failed
+ *
+ * @throws ESException in case the comparison fails for technical reasons
+ */
+ public static boolean execute(ESLocalProject localProject, ESPrimaryVersionSpec versionSpec,
+ IProgressMonitor monitor, boolean shouldFail) throws ESException {
+
+ WorkspaceUtil.logWarning("Checksum comparison failed.", null); //$NON-NLS-1$
+
+ final Project project = ESLocalProjectImpl.class.cast(localProject).toInternalAPI().getProject();
+ final ESLocalProject serverESProject = localProject
+ .getRemoteProject()
+ .checkout(
+ "log_error_checksum_debug_checkout", localProject.getUsersession(), versionSpec, //$NON-NLS-1$
+ new NullProgressMonitor());
+ final Project serverProject = ESLocalProjectImpl.class.cast(serverESProject).toInternalAPI()
+ .getProject();
+ try {
+
+ final Map<Object, Object> formatOptions = new LinkedHashMap<Object, Object>();
+ formatOptions.put(XMLResource.OPTION_DECLARE_XML, Boolean.TRUE);
+ formatOptions.put(XMLResource.OPTION_FORMATTED, Boolean.TRUE);
+
+ final String localSerialization = ModelUtil
+ .eObjectToString(project, ModelUtil.getResourceSaveOptions());
+ final String serverSerialization = ModelUtil.eObjectToString(serverProject,
+ ModelUtil.getResourceSaveOptions());
+
+ serverESProject.delete(new NullProgressMonitor());
+
+ final File localFile = Activator.getDefault().getBundle().getDataFile("localProjectSerialization.txt"); //$NON-NLS-1$
+ final File serverFile = Activator.getDefault().getBundle()
+ .getDataFile("serverProjectSerialization.txt"); //$NON-NLS-1$
+
+ final FileWriter fileWriterLocal = new FileWriter(localFile);
+ fileWriterLocal.write(localSerialization);
+ fileWriterLocal.close();
+ final FileWriter fileWriterServer = new FileWriter(serverFile);
+ fileWriterServer.write(serverSerialization);
+ fileWriterServer.close();
+ } catch (final SerializationException ex) {
+ WorkspaceUtil.logException("Couldn't log the serializations.", ex); //$NON-NLS-1$
+ } catch (final IOException ex) {
+ WorkspaceUtil.logException("Couldn't save the serializations.", ex); //$NON-NLS-1$
+ }
+ return !shouldFail;
+ }
+}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/EMFStoreClientUtil.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/EMFStoreClientUtil.java
index dfe0844..fa9daaf 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/EMFStoreClientUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/EMFStoreClientUtil.java
@@ -11,6 +11,8 @@
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.model.util;
+import java.text.MessageFormat;
+
import org.eclipse.emf.emfstore.client.ESLocalProject;
import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
import org.eclipse.emf.emfstore.internal.client.model.ModelFactory;
@@ -18,11 +20,14 @@
import org.eclipse.emf.emfstore.internal.client.model.ServerInfo;
import org.eclipse.emf.emfstore.internal.client.model.Usersession;
import org.eclipse.emf.emfstore.internal.client.model.connectionmanager.KeyStoreManager;
+import org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceBase;
import org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceBase;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESWorkspaceImpl;
import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
+import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.BranchVersionSpec;
import org.eclipse.emf.emfstore.server.exceptions.ESException;
/**
@@ -32,6 +37,7 @@
*/
public final class EMFStoreClientUtil {
+ private static final String MSG_FORMAT = "{0}: {1}"; //$NON-NLS-1$
private static final String LOCALHOST_GENERATED_ENTRY_NAME = "EMFStore (generated entry)"; //$NON-NLS-1$
/**
@@ -167,4 +173,154 @@
return ModelUtil.areEqual(projectSpaceA.getProject(), projectSpaceB.getProject());
}
+
+ /**
+ * Logs fine grained details about the state of a project action.
+ *
+ * @param loggingPrefix the logging prefix
+ * @param message the message describing the current state
+ * @param projectSpace the project space
+ * @param branchSpec the branch spec
+ * @param usersession the usersession
+ */
+ public static void logProjectDetails(
+ String loggingPrefix,
+ String message,
+ ProjectSpaceBase projectSpace,
+ BranchVersionSpec branchSpec,
+ Usersession usersession) {
+ if (!Boolean.getBoolean("emfstore.logDetails")) { //$NON-NLS-1$
+ return;
+ }
+ String branch = null;
+ if (branchSpec != null) {
+ branch = branchSpec.getBranch();
+ }
+ EMFStoreClientUtil.logProjectDetails(loggingPrefix, message, projectSpace, branch, usersession);
+ }
+
+ /**
+ * Logs fine grained details about the state of a project action.
+ *
+ * @param loggingPrefix the logging prefix
+ * @param message the message describing the current state
+ * @param projectSpace the project space
+ * @param branch the branch name
+ * @param usersession the usersession
+ */
+ public static void logProjectDetails(
+ String loggingPrefix,
+ String message,
+ ProjectSpaceBase projectSpace,
+ String branch,
+ Usersession usersession) {
+ if (!Boolean.getBoolean("emfstore.logDetails")) { //$NON-NLS-1$
+ return;
+ }
+ String projectName = null;
+ String projectId = null;
+ int revision = -1;
+ String user = null;
+
+ if (projectSpace != null) {
+ projectName = projectSpace.getProjectName();
+ if (projectSpace.getProjectId() != null) {
+ projectId = projectSpace.getProjectId().getId();
+ }
+ if (projectSpace.getBaseVersion() != null) {
+ revision = projectSpace.getBaseVersion().getIdentifier();
+ }
+ }
+
+ if (usersession != null) {
+ user = usersession.getUsername();
+ }
+
+ ModelUtil.logProjectDetails(
+ MessageFormat.format(MSG_FORMAT, loggingPrefix, message),
+ user,
+ projectName,
+ projectId,
+ branch,
+ revision);
+ }
+
+ /**
+ * Logs fine grained details about the state of a project action.
+ *
+ * @param loggingPrefix the logging prefix
+ * @param message the message describing the current state
+ * @param projectIdO the project id
+ * @param branchSpec the branch spec
+ */
+ public static void logProjectDetails(
+ String loggingPrefix,
+ String message,
+ ProjectId projectIdO,
+ BranchVersionSpec branchSpec) {
+ if (!Boolean.getBoolean("emfstore.logDetails")) { //$NON-NLS-1$
+ return;
+ }
+
+ String branch = null;
+ if (branchSpec != null) {
+ branch = branchSpec.getBranch();
+ }
+
+ EMFStoreClientUtil.logProjectDetails(loggingPrefix, message, projectIdO, branch);
+ }
+
+ /**
+ * Logs fine grained details about the state of a project action.
+ *
+ * @param loggingPrefix the logging prefix
+ * @param message the message describing the current state
+ * @param projectIdO the project id
+ * @param branch the branch spec
+ */
+ public static void logProjectDetails(
+ String loggingPrefix,
+ String message,
+ ProjectId projectIdO,
+ String branch) {
+
+ if (!Boolean.getBoolean("emfstore.logDetails")) { //$NON-NLS-1$
+ return;
+ }
+ String projectId = null;
+ if (projectIdO != null) {
+ projectId = projectIdO.getId();
+ }
+
+ ModelUtil.logProjectDetails(
+ MessageFormat.format(MSG_FORMAT, loggingPrefix, message),
+ null,
+ null,
+ projectId,
+ branch,
+ -1);
+ }
+
+ /**
+ * Logs fine grained details about the state of a project action.
+ *
+ * @param loggingPrefix the logging prefix
+ * @param message the message describing the current state
+ */
+ public static void logProjectDetails(
+ String loggingPrefix,
+ String message) {
+
+ if (!Boolean.getBoolean("emfstore.logDetails")) { //$NON-NLS-1$
+ return;
+ }
+
+ ModelUtil.logProjectDetails(
+ MessageFormat.format(MSG_FORMAT, loggingPrefix, message),
+ null,
+ null,
+ null,
+ null,
+ -1);
+ }
}
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelAdapterFactory.java
index 97c78a8..ff4a810 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelAdapterFactory.java
@@ -47,8 +47,7 @@
* @generated
*/
public ModelAdapterFactory() {
- if (modelPackage == null)
- {
+ if (modelPackage == null) {
modelPackage = ModelPackage.eINSTANCE;
}
}
@@ -64,12 +63,10 @@
*/
@Override
public boolean isFactoryForType(Object object) {
- if (object == modelPackage)
- {
+ if (object == modelPackage) {
return true;
}
- if (object instanceof EObject)
- {
+ if (object instanceof EObject) {
return ((EObject) object).eClass().getEPackage() == modelPackage;
}
return false;
@@ -81,47 +78,39 @@
*
* @generated
*/
- protected ModelSwitch<Adapter> modelSwitch = new ModelSwitch<Adapter>()
- {
+ protected ModelSwitch<Adapter> modelSwitch = new ModelSwitch<Adapter>() {
@Override
- public Adapter caseWorkspace(Workspace object)
- {
+ public Adapter caseWorkspace(Workspace object) {
return createWorkspaceAdapter();
}
@Override
- public Adapter caseServerInfo(ServerInfo object)
- {
+ public Adapter caseServerInfo(ServerInfo object) {
return createServerInfoAdapter();
}
@Override
- public Adapter caseUsersession(Usersession object)
- {
+ public Adapter caseUsersession(Usersession object) {
return createUsersessionAdapter();
}
@Override
- public Adapter caseProjectSpace(ProjectSpace object)
- {
+ public Adapter caseProjectSpace(ProjectSpace object) {
return createProjectSpaceAdapter();
}
@Override
- public Adapter casePendingFileTransfer(PendingFileTransfer object)
- {
+ public Adapter casePendingFileTransfer(PendingFileTransfer object) {
return createPendingFileTransferAdapter();
}
@Override
- public Adapter caseIdentifiableElement(IdentifiableElement object)
- {
+ public Adapter caseIdentifiableElement(IdentifiableElement object) {
return createIdentifiableElementAdapter();
}
@Override
- public Adapter defaultCase(EObject object)
- {
+ public Adapter defaultCase(EObject object) {
return createEObjectAdapter();
}
};
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelSwitch.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelSwitch.java
index 48ef873..51d1aca 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/util/ModelSwitch.java
@@ -54,8 +54,7 @@
* @generated
*/
public ModelSwitch() {
- if (modelPackage == null)
- {
+ if (modelPackage == null) {
modelPackage = ModelPackage.eINSTANCE;
}
}
@@ -83,14 +82,11 @@
* @generated
*/
protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage)
- {
+ if (theEClass.eContainer() == modelPackage) {
return doSwitch(theEClass.getClassifierID(), theEObject);
}
final List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
/**
@@ -103,8 +99,7 @@
* @generated
*/
protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID)
- {
+ switch (classifierID) {
case ModelPackage.WORKSPACE: {
final Workspace workspace = (Workspace) theEObject;
T result = caseWorkspace(workspace);
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/observers/SimpleOperationObserver.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/observers/SimpleOperationObserver.java
index cf66353..2218a6d 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/observers/SimpleOperationObserver.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/observers/SimpleOperationObserver.java
@@ -66,7 +66,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.observers.OperationObserver#operationUndone(org.eclipse.emf.emfstore.internal.client.model.ProjectSpace,
* org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation)
*/
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/provider/ProjectSpaceFileURIHandler.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/provider/ProjectSpaceFileURIHandler.java
index 9dcca04..e60739b 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/provider/ProjectSpaceFileURIHandler.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/provider/ProjectSpaceFileURIHandler.java
@@ -46,14 +46,14 @@
}
@Override
- public void delete(URI uri, Map<?, ?> options) throws IOException
- {
+ public void delete(URI uri, Map<?, ?> options) throws IOException {
// TODO options?
final File file = new File(uri.toFileString());
final File parent = file.getParentFile();
file.delete();
- if (parent != null && parent.exists() && parent.listFiles().length == 1 && parent.listFiles()[0].isDirectory()) {
+ if (parent != null && parent.exists() && parent.listFiles().length == 1
+ && parent.listFiles()[0].isDirectory()) {
// if there is only one directory left, it's the temp folder.
FileUtils.deleteDirectory(parent);
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
index fa54bc9..cf1666e 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/META-INF/MANIFEST.MF
@@ -2,17 +2,17 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Common Model Edit
Bundle-SymbolicName: org.eclipse.emf.emfstore.common.model.edit;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.emfstore.internal.common.model.provider.CommonEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.emfstore.internal.common.model.provide
- r;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.server.model.e
+ r;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.server.model.e
dit,org.eclipse.emf.emfstore.client.model.edit,org.eclipse.emf.emfsto
re.client.test"
Require-Bundle: org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
index fe6ae77..a4efe14 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.common.model.edit</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/CommonEditPlugin.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/CommonEditPlugin.java
index 5bf5a28..9a90a61 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/CommonEditPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/CommonEditPlugin.java
@@ -20,8 +20,7 @@
*
* @generated
*/
-public final class CommonEditPlugin extends EMFPlugin
-{
+public final class CommonEditPlugin extends EMFPlugin {
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -47,11 +46,9 @@
*
* @generated
*/
- public CommonEditPlugin()
- {
- super(new ResourceLocator[]
- {
- });
+ public CommonEditPlugin() {
+ super(new ResourceLocator[] {
+ });
}
/**
@@ -63,8 +60,7 @@
* @generated
*/
@Override
- public ResourceLocator getPluginResourceLocator()
- {
+ public ResourceLocator getPluginResourceLocator() {
return plugin;
}
@@ -76,8 +72,7 @@
* @return the singleton instance.
* @generated
*/
- public static Implementation getPlugin()
- {
+ public static Implementation getPlugin() {
return plugin;
}
@@ -88,8 +83,7 @@
*
* @generated
*/
- public static class Implementation extends EclipsePlugin
- {
+ public static class Implementation extends EclipsePlugin {
/**
* Creates an instance.
* <!-- begin-user-doc -->
@@ -97,8 +91,7 @@
*
* @generated
*/
- public Implementation()
- {
+ public Implementation() {
super();
// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/EMFStorePropertyItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/EMFStorePropertyItemProvider.java
index 269155a..77e1ab4 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/EMFStorePropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/EMFStorePropertyItemProvider.java
@@ -57,8 +57,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addKeyPropertyDescriptor(object);
@@ -77,9 +76,8 @@
* @generated
*/
protected void addKeyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_EMFStoreProperty_key_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_EMFStoreProperty_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -101,9 +99,8 @@
* @generated
*/
protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_EMFStoreProperty_value_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_EMFStoreProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -125,9 +122,8 @@
* @generated
*/
protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_EMFStoreProperty_type_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_EMFStoreProperty_type_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -149,9 +145,8 @@
* @generated
*/
protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_EMFStoreProperty_version_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_EMFStoreProperty_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -187,8 +182,7 @@
@Override
public String getText(Object object) {
final String label = ((EMFStoreProperty) object).getKey();
- return label == null || label.length() == 0 ?
- getString("_UI_EMFStoreProperty_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_EMFStoreProperty_type") : //$NON-NLS-1$
getString("_UI_EMFStoreProperty_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -204,8 +198,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(EMFStoreProperty.class))
- {
+ switch (notification.getFeatureID(EMFStoreProperty.class)) {
case ModelPackage.EMF_STORE_PROPERTY__KEY:
case ModelPackage.EMF_STORE_PROPERTY__TYPE:
case ModelPackage.EMF_STORE_PROPERTY__VERSION:
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/IdentifiableElementItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/IdentifiableElementItemProvider.java
index db7b6e0..b5ae12b 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/IdentifiableElementItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/IdentifiableElementItemProvider.java
@@ -55,8 +55,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addIdentifierPropertyDescriptor(object);
@@ -71,9 +70,8 @@
* @generated
*/
protected void addIdentifierPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_IdentifiableElement_identifier_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_IdentifiableElement_identifier_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -96,8 +94,7 @@
@Override
public String getText(Object object) {
final String label = ((IdentifiableElement) object).getIdentifier();
- return label == null || label.length() == 0 ?
- getString("_UI_IdentifiableElement_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_IdentifiableElement_type") : //$NON-NLS-1$
getString("_UI_IdentifiableElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -112,8 +109,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(IdentifiableElement.class))
- {
+ switch (notification.getFeatureID(IdentifiableElement.class)) {
case ModelPackage.IDENTIFIABLE_ELEMENT__IDENTIFIER:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelElementIdItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelElementIdItemProvider.java
index 872ad82..0960a57 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelElementIdItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelElementIdItemProvider.java
@@ -44,8 +44,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
@@ -72,8 +71,7 @@
@Override
public String getText(Object object) {
final String label = ((ModelElementId) object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_ModelElementId_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_ModelElementId_type") : //$NON-NLS-1$
getString("_UI_ModelElementId_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelItemProviderAdapterFactory.java
index 94676eb..7095e37 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelItemProviderAdapterFactory.java
@@ -103,8 +103,7 @@
*/
@Override
public Adapter createProjectAdapter() {
- if (projectItemProvider == null)
- {
+ if (projectItemProvider == null) {
projectItemProvider = new ProjectItemProvider(this);
}
@@ -130,8 +129,7 @@
*/
@Override
public Adapter createModelElementIdAdapter() {
- if (modelElementIdItemProvider == null)
- {
+ if (modelElementIdItemProvider == null) {
modelElementIdItemProvider = new ModelElementIdItemProvider(this);
}
@@ -157,8 +155,7 @@
*/
@Override
public Adapter createModelVersionAdapter() {
- if (modelVersionItemProvider == null)
- {
+ if (modelVersionItemProvider == null) {
modelVersionItemProvider = new ModelVersionItemProvider(this);
}
@@ -184,8 +181,7 @@
*/
@Override
public Adapter createEMFStorePropertyAdapter() {
- if (emfStorePropertyItemProvider == null)
- {
+ if (emfStorePropertyItemProvider == null) {
emfStorePropertyItemProvider = new EMFStorePropertyItemProvider(this);
}
@@ -210,8 +206,7 @@
*/
@Override
public Adapter createPropertyMapEntryAdapter() {
- if (propertyMapEntryItemProvider == null)
- {
+ if (propertyMapEntryItemProvider == null) {
propertyMapEntryItemProvider = new PropertyMapEntryItemProvider(this);
}
@@ -237,8 +232,7 @@
*/
@Override
public Adapter createPropertyStringValueAdapter() {
- if (propertyStringValueItemProvider == null)
- {
+ if (propertyStringValueItemProvider == null) {
propertyStringValueItemProvider = new PropertyStringValueItemProvider(this);
}
@@ -298,11 +292,9 @@
*/
@Override
public Object adapt(Object object, Object type) {
- if (isFactoryForType(type))
- {
+ if (isFactoryForType(type)) {
final Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
- {
+ if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
return adapter;
}
}
@@ -342,8 +334,7 @@
public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null)
- {
+ if (parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelVersionItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelVersionItemProvider.java
index ea984c7..85754c2 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelVersionItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ModelVersionItemProvider.java
@@ -54,8 +54,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addReleaseNumberPropertyDescriptor(object);
@@ -70,9 +69,8 @@
* @generated
*/
protected void addReleaseNumberPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_ModelVersion_releaseNumber_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_ModelVersion_releaseNumber_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -120,8 +118,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(ModelVersion.class))
- {
+ switch (notification.getFeatureID(ModelVersion.class)) {
case ModelPackage.MODEL_VERSION__RELEASE_NUMBER:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ProjectItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ProjectItemProvider.java
index d5225a5..e68594b 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ProjectItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/ProjectItemProvider.java
@@ -56,8 +56,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
@@ -74,8 +73,7 @@
*/
@Override
public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
- if (childrenFeatures == null)
- {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS);
childrenFeatures.add(ModelPackage.Literals.PROJECT__CUT_ELEMENTS);
@@ -108,8 +106,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Project.class))
- {
+ switch (notification.getFeatureID(Project.class)) {
case ModelPackage.PROJECT__MODEL_ELEMENTS:
case ModelPackage.PROJECT__CUT_ELEMENTS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
@@ -129,65 +126,41 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.createProject()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.createProject()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.createModelElementId()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.createModelElementId()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.createModelVersion()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.createModelVersion()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.createEMFStoreProperty()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.createEMFStoreProperty()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.create(ModelPackage.Literals.PROPERTY_MAP_ENTRY)));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.create(ModelPackage.Literals.PROPERTY_MAP_ENTRY)));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.createPropertyStringValue()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.createPropertyStringValue()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
- ModelFactory.eINSTANCE.createProject()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
+ ModelFactory.eINSTANCE.createProject()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
- ModelFactory.eINSTANCE.createModelElementId()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
+ ModelFactory.eINSTANCE.createModelElementId()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
- ModelFactory.eINSTANCE.createModelVersion()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
+ ModelFactory.eINSTANCE.createModelVersion()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
- ModelFactory.eINSTANCE.createEMFStoreProperty()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
+ ModelFactory.eINSTANCE.createEMFStoreProperty()));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
- ModelFactory.eINSTANCE.create(ModelPackage.Literals.PROPERTY_MAP_ENTRY)));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
+ ModelFactory.eINSTANCE.create(ModelPackage.Literals.PROPERTY_MAP_ENTRY)));
- newChildDescriptors.add
- (createChildParameter
- (ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
- ModelFactory.eINSTANCE.createPropertyStringValue()));
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.PROJECT__CUT_ELEMENTS,
+ ModelFactory.eINSTANCE.createPropertyStringValue()));
}
/**
@@ -201,12 +174,10 @@
final Object childFeature = feature;
final Object childObject = child;
- final boolean qualify =
- childFeature == ModelPackage.Literals.PROJECT__MODEL_ELEMENTS ||
- childFeature == ModelPackage.Literals.PROJECT__CUT_ELEMENTS;
+ final boolean qualify = childFeature == ModelPackage.Literals.PROJECT__MODEL_ELEMENTS ||
+ childFeature == ModelPackage.Literals.PROJECT__CUT_ELEMENTS;
- if (qualify)
- {
+ if (qualify) {
return getString("_UI_CreateChild_text2", //$NON-NLS-1$
new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyMapEntryItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyMapEntryItemProvider.java
index 784e13c..2b75a12 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyMapEntryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyMapEntryItemProvider.java
@@ -56,8 +56,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addKeyPropertyDescriptor(object);
@@ -74,9 +73,8 @@
* @generated
*/
protected void addKeyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PropertyMapEntry_key_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_PropertyMapEntry_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -98,9 +96,8 @@
* @generated
*/
protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PropertyMapEntry_value_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_PropertyMapEntry_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -151,8 +148,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Map.Entry.class))
- {
+ switch (notification.getFeatureID(Map.Entry.class)) {
case ModelPackage.PROPERTY_MAP_ENTRY__KEY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyStringValueItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyStringValueItemProvider.java
index 933ce60..c4bd5f4 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyStringValueItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/PropertyStringValueItemProvider.java
@@ -17,11 +17,7 @@
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.ResourceLocator;
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
import org.eclipse.emf.emfstore.internal.common.model.ModelPackage;
@@ -35,8 +31,7 @@
*
* @generated
*/
-public class PropertyStringValueItemProvider extends RootElementItemProvider implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PropertyStringValueItemProvider extends RootElementItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -57,8 +52,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addValuePropertyDescriptor(object);
@@ -74,9 +68,8 @@
* @generated
*/
protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PropertyStringValue_value_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_PropertyStringValue_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -112,8 +105,7 @@
@Override
public String getText(Object object) {
final String label = ((PropertyStringValue) object).getValue();
- return label == null || label.length() == 0 ?
- getString("_UI_PropertyStringValue_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_PropertyStringValue_type") : //$NON-NLS-1$
getString("_UI_PropertyStringValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -129,8 +121,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(PropertyStringValue.class))
- {
+ switch (notification.getFeatureID(PropertyStringValue.class)) {
case ModelPackage.PROPERTY_STRING_VALUE__VALUE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
diff --git a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/UniqueIdentifierItemProvider.java b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/UniqueIdentifierItemProvider.java
index a51fcbe..88ee649 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/UniqueIdentifierItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model.edit/src/org/eclipse/emf/emfstore/internal/common/model/provider/UniqueIdentifierItemProvider.java
@@ -55,8 +55,7 @@
*/
@Override
public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
- if (itemPropertyDescriptors == null)
- {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addIdPropertyDescriptor(object);
@@ -71,9 +70,8 @@
* @generated
*/
protected void addIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_UniqueIdentifier_id_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_UniqueIdentifier_id_feature", //$NON-NLS-1$ //$NON-NLS-2$
@@ -96,8 +94,7 @@
@Override
public String getText(Object object) {
final String label = ((UniqueIdentifier) object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_UniqueIdentifier_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_UniqueIdentifier_type") : //$NON-NLS-1$
getString("_UI_UniqueIdentifier_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -112,8 +109,7 @@
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(UniqueIdentifier.class))
- {
+ switch (notification.getFeatureID(UniqueIdentifier.class)) {
case ModelPackage.UNIQUE_IDENTIFIER__ID:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.common.model/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
index 323c51d..bfc5125 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.common.model/META-INF/MANIFEST.MF
@@ -2,50 +2,70 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Common Model
Bundle-SymbolicName: org.eclipse.emf.emfstore.common.model;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.common;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.emf.emfstore.common;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.common.model;version="1.8.1",
- org.eclipse.emf.emfstore.common.model.util;version="1.8.1",org.eclips
- e.emf.emfstore.internal.common.model;version="1.8.1"; x-friends:="org
- .eclipse.emf.emfstore.client, org.eclipse.emf.emfstore.client.model.
- edit, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.emfstore.
- common.model.edit, org.eclipse.emf.emfstore.ecore, org.eclipse.emf.
- emfstore.example.merging, org.eclipse.emf.emfstore.fuzzy.emf.test,
- org.eclipse.emf.emfstore.server, org.eclipse.emf.emfstore.server.mod
- el, org.eclipse.emf.emfstore.server.model.edit, org.eclipse.emf.emf
- store.test.common, org.eclipse.emf.emfstore.client.changetracking.te
- st, org.eclipse.emf.emfstore.client.conflictdetection.test, org.ecl
- ipse.emf.emfstore.client.recording.test, org.eclipse.emf.emfstore.cl
- ient.test, org.eclipse.emf.emfstore.server.test, org.eclipse.emf.ec
- p.emfstore.core, org.eclipse.emf.ecp.emfstore.ui.e3, org.eclipse.em
- f.emfstore.performance.test, org.eclipse.emf.emfstore.fuzzy.emf, or
- g.eclipse.emf.emfstore.client.ui.test",org.eclipse.emf.emfstore.inter
- nal.common.model.impl;version="1.8.1"; x-friends:="org.eclipse.emf.em
- fstore.client, org.eclipse.emf.emfstore.client.changetracking.test,
- org.eclipse.emf.emfstore.client.recording.test, org.eclipse.emf.emf
- store.client.ui, org.eclipse.emf.emfstore.server, org.eclipse.emf.e
- mfstore.server.model, org.eclipse.emf.ecp.emfstore.core, org.eclips
- e.emf.emfstore.client.conflictdetection.test",org.eclipse.emf.emfstor
- e.internal.common.model.impl.util;version="1.8.1";x-internal:=true,or
- g.eclipse.emf.emfstore.internal.common.model.util;version="1.8.1"; x-
- friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfstore.
- client.ui, org.eclipse.emf.emfstore.common.model.edit, org.eclipse.
- emf.emfstore.fuzzy.emf.test, org.eclipse.emf.emfstore.migration, or
- g.eclipse.emf.emfstore.server, org.eclipse.emf.emfstore.server.model
- , org.eclipse.emf.emfstore.server.model.edit, org.eclipse.emf.emfst
- ore.server.test, org.eclipse.emf.emfstore.test.common, org.eclipse.
- emf.emfstore.client.changetracking.test, org.eclipse.emf.emfstore.cl
- ient.recording.test, org.eclipse.emf.emfstore.client.test, org.ecli
- pse.emf.emfstore.client.conflictdetection.test, org.eclipse.emf.ecp.
- emfstore.core, org.eclipse.emf.emfstore.client.api.test, org.eclips
- e.emf.emfstore.performance.test, org.eclipse.emf.emfstore.migration.
- edapt"
+Export-Package: org.eclipse.emf.emfstore.common.model;version="1.9.0",
+ org.eclipse.emf.emfstore.common.model.util;version="1.9.0",
+ org.eclipse.emf.emfstore.internal.common.model;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client,
+ org.eclipse.emf.emfstore.client.model.edit,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.common.model.edit,
+ org.eclipse.emf.emfstore.ecore,
+ org.eclipse.emf.emfstore.example.merging,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.server,
+ org.eclipse.emf.emfstore.server.model,
+ org.eclipse.emf.emfstore.server.model.edit,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.client.changetracking.test,
+ org.eclipse.emf.emfstore.client.conflictdetection.test,
+ org.eclipse.emf.emfstore.client.recording.test,
+ org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.ecp.emfstore.ui.e3,
+ org.eclipse.emf.emfstore.performance.test,
+ org.eclipse.emf.emfstore.fuzzy.emf,
+ org.eclipse.emf.emfstore.client.ui.test,
+ org.eclipse.emf.emfstore.ecore.test",
+ org.eclipse.emf.emfstore.internal.common.model.impl;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client,
+ org.eclipse.emf.emfstore.client.changetracking.test,
+ org.eclipse.emf.emfstore.client.recording.test,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.server,
+ org.eclipse.emf.emfstore.server.model,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.emfstore.client.conflictdetection.test",
+ org.eclipse.emf.emfstore.internal.common.model.impl.util;version="1.9.0";x-internal:=true,
+ org.eclipse.emf.emfstore.internal.common.model.util;version="1.9.0";
+ x-friends:="org.eclipse.emf.emfstore.client,
+ org.eclipse.emf.emfstore.client.ui,
+ org.eclipse.emf.emfstore.common.model.edit,
+ org.eclipse.emf.emfstore.fuzzy.emf.test,
+ org.eclipse.emf.emfstore.migration,
+ org.eclipse.emf.emfstore.server,
+ org.eclipse.emf.emfstore.server.model,
+ org.eclipse.emf.emfstore.server.model.edit,
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.test.common,
+ org.eclipse.emf.emfstore.client.changetracking.test,
+ org.eclipse.emf.emfstore.client.recording.test,
+ org.eclipse.emf.emfstore.client.test,
+ org.eclipse.emf.emfstore.client.conflictdetection.test,
+ org.eclipse.emf.ecp.emfstore.core,
+ org.eclipse.emf.emfstore.client.api.test,
+ org.eclipse.emf.emfstore.performance.test,
+ org.eclipse.emf.emfstore.migration.edapt,
+ org.eclipse.emf.emfstore.ecore.test,
+ org.eclipse.emf.emfstore.ecore"
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/model/common.genmodel b/bundles/org.eclipse.emf.emfstore.common.model/model/common.genmodel
index b7f3721..9ac407f 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/model/common.genmodel
+++ b/bundles/org.eclipse.emf.emfstore.common.model/model/common.genmodel
@@ -4,13 +4,13 @@
modelDirectory="/org.eclipse.emf.emfstore.internal.common.model/src" editDirectory="/org.eclipse.emf.emfstore.common.model.edit/src"
editorDirectory="/org.eclipse.emf.emfstore.internal.common.model.editor/src" modelPluginID="org.eclipse.emf.emfstore.common.model"
modelName="Common" editPluginClass="org.eclipse.emf.emfstore.internal.common.model.provider.CommonEditPlugin"
- codeFormatting="true" commentFormatting="true" importerID="org.eclipse.emf.importer.ecore"
+ nonNLSMarkers="true" codeFormatting="true" commentFormatting="true" importerID="org.eclipse.emf.importer.ecore"
containmentProxies="true" complianceLevel="5.0" copyrightFields="false" providerRootExtendsClass="org.eclipse.emf.emfstore.internal.common.model.provider.RootElementItemProvider"
editPluginID="org.eclipse.emf.emfstore.common.model.edit" editorPluginID="org.eclipse.emf.emfstore.internal.common.model.editor"
runtimeVersion="2.5" language="">
<foreignModel>common.ecore</foreignModel>
- <genPackages prefix="Model" basePackage="org.eclipse.emf.emfstore.internal.common"
- disposableProviderFactory="true" ecorePackage="common.ecore#/">
+ <genPackages prefix="Model" basePackage="org.eclipse.emf.emfstore.common" disposableProviderFactory="true"
+ ecorePackage="common.ecore#/">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="common.ecore#//EMFStorePropertyType">
<genEnumLiterals ecoreEnumLiteral="common.ecore#//EMFStorePropertyType/Shared"/>
<genEnumLiterals ecoreEnumLiteral="common.ecore#//EMFStorePropertyType/Local"/>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/plugin.xml b/bundles/org.eclipse.emf.emfstore.common.model/plugin.xml
index 0a1cfb8..4db3f07 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/plugin.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model/plugin.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- <extension-point id="modelVersion" name="ModelVersion" schema="schema/modelVersion.exsd"/>
- <extension-point id="ignoreDatatype" name="Ignore Datatype" schema="schema/ignoreDatatype.exsd"/>
- <extension-point id="singletonIdResolver" name="Singleton ID Resolver" schema="schema/singletonIdResolver.exsd"/>
- <extension-point id="serializationOptions" name="Serialization Options" schema="schema/serializationOptions.exsd"/>
-
- <extension point="org.eclipse.emf.ecore.generated_package">
- <package
- uri="http://eclipse.org/emf/emfstore/common/model"
- class="org.eclipse.emf.emfstore.internal.common.model.ModelPackage"
- genModel="model/common.genmodel"/>
- </extension>
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="modelVersion" name="ModelVersion" schema="schema/modelVersion.exsd"/>
+ <extension-point id="ignoreDatatype" name="Ignore Datatype" schema="schema/ignoreDatatype.exsd"/>
+ <extension-point id="singletonIdResolver" name="Singleton ID Resolver" schema="schema/singletonIdResolver.exsd"/>
+ <extension-point id="serializationOptions" name="Serialization Options" schema="schema/serializationOptions.exsd"/>
+
+ <extension point="org.eclipse.emf.ecore.generated_package">
+ <package
+ uri="http://eclipse.org/emf/emfstore/common/model"
+ class="org.eclipse.emf.emfstore.internal.common.model.ModelPackage"
+ genModel="model/common.genmodel"/>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/pom.xml b/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
index 8d5ab67..bcb8f26 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common.model/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.common.model</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/schema/ignoreDatatype.exsd b/bundles/org.eclipse.emf.emfstore.common.model/schema/ignoreDatatype.exsd
index 3b6e636..f00b032 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/schema/ignoreDatatype.exsd
+++ b/bundles/org.eclipse.emf.emfstore.common.model/schema/ignoreDatatype.exsd
@@ -13,7 +13,7 @@
<element name="extension">
<annotation>
<appInfo>
- <meta.element />
+ <meta.element deprecated="true" />
</appInfo>
</annotation>
<complexType>
@@ -48,6 +48,11 @@
</element>
<element name="ignoredatatype">
+ <annotation>
+ <appInfo>
+ <meta.element deprecated="true"/>
+ </appInfo>
+ </annotation>
<complexType>
<attribute name="type" type="string">
<annotation>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/schema/singletonIdResolver.exsd b/bundles/org.eclipse.emf.emfstore.common.model/schema/singletonIdResolver.exsd
index fb4de29..5aa9671 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/schema/singletonIdResolver.exsd
+++ b/bundles/org.eclipse.emf.emfstore.common.model/schema/singletonIdResolver.exsd
@@ -13,7 +13,7 @@
<element name="extension">
<annotation>
<appInfo>
- <meta.element />
+ <meta.element deprecated="true" />
</appInfo>
</annotation>
<complexType>
@@ -48,6 +48,11 @@
</element>
<element name="singletonidresolver">
+ <annotation>
+ <appInfo>
+ <meta.element deprecated="true"/>
+ </appInfo>
+ </annotation>
<complexType>
<attribute name="class" type="string">
<annotation>
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStoreProperty.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStoreProperty.java
index d373caa..dd44c5c 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStoreProperty.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStoreProperty.java
@@ -19,13 +19,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getVersion <em>Version</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getEMFStoreProperty()
* @model
@@ -53,9 +53,8 @@
String getKey();
/**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getKey
- * <em>Key</em>}'
- * attribute.
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getKey <em>Key</em>
+ * }' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -84,8 +83,7 @@
/**
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getValue
- * <em>Value</em>}'
- * containment reference.
+ * <em>Value</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -116,8 +114,7 @@
/**
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getType
- * <em>Type</em>}'
- * attribute.
+ * <em>Type</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -147,7 +144,7 @@
/**
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getVersion
- * <em>Version</em>} ' attribute.
+ * <em>Version</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStorePropertyType.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStorePropertyType.java
index 5af2f5e..fb5596c 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStorePropertyType.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/EMFStorePropertyType.java
@@ -88,7 +88,10 @@
*
* @generated
*/
- private static final EMFStorePropertyType[] VALUES_ARRAY = new EMFStorePropertyType[] { SHARED, LOCAL, };
+ private static final EMFStorePropertyType[] VALUES_ARRAY = new EMFStorePropertyType[] {
+ SHARED,
+ LOCAL,
+ };
/**
* A public read-only list of all the '<em><b>EMF Store Property Type</b></em>' enumerators.
@@ -104,6 +107,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static EMFStorePropertyType get(String literal) {
@@ -121,6 +126,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static EMFStorePropertyType getByName(String name) {
@@ -138,6 +145,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static EMFStorePropertyType get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/IdentifiableElement.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/IdentifiableElement.java
index fd782d8..ec06be5 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/IdentifiableElement.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/IdentifiableElement.java
@@ -18,10 +18,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement#getIdentifier <em>Identifier</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getIdentifiableElement()
* @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelPackage.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelPackage.java
index 950afb5..2aefc67 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelPackage.java
@@ -57,7 +57,7 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @generated
+ * @generated NOT
*/
String eNS_PREFIX = "org.eclipse.emf.emfstore.internal.common.model"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelVersion.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelVersion.java
index c2af70f..b48a688 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelVersion.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelVersion.java
@@ -17,10 +17,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.ModelVersion#getReleaseNumber <em>Release Number</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getModelVersion()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/PropertyStringValue.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/PropertyStringValue.java
index c60ff8c..40b4ab7 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/PropertyStringValue.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/PropertyStringValue.java
@@ -19,10 +19,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue#getValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getPropertyStringValue()
* @model
@@ -48,8 +48,7 @@
/**
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue#getValue
- * <em>Value</em>}'
- * attribute.
+ * <em>Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/EMFStorePropertyImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/EMFStorePropertyImpl.java
index 7b2156f..ac1d36e 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/EMFStorePropertyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/EMFStorePropertyImpl.java
@@ -27,13 +27,13 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl#getKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl#getType <em>Type</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl#getVersion <em>Version</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -173,8 +173,8 @@
value = eResolveProxy(oldValue);
if (value != oldValue) {
final InternalEObject newValue = (InternalEObject) value;
- NotificationChain msgs = oldValue.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.EMF_STORE_PROPERTY__VALUE, null, null);
+ NotificationChain msgs = oldValue.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.EMF_STORE_PROPERTY__VALUE, null, null);
if (newValue.eInternalContainer() == null) {
msgs = newValue.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - ModelPackage.EMF_STORE_PROPERTY__VALUE,
null, msgs);
@@ -232,12 +232,12 @@
if (newValue != value) {
NotificationChain msgs = null;
if (value != null) {
- msgs = ((InternalEObject) value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.EMF_STORE_PROPERTY__VALUE, null, msgs);
+ msgs = ((InternalEObject) value).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.EMF_STORE_PROPERTY__VALUE, null, msgs);
}
if (newValue != null) {
- msgs = ((InternalEObject) newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ModelPackage.EMF_STORE_PROPERTY__VALUE, null, msgs);
+ msgs = ((InternalEObject) newValue).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ModelPackage.EMF_STORE_PROPERTY__VALUE, null, msgs);
}
msgs = basicSetValue(newValue, msgs);
if (msgs != null) {
@@ -269,7 +269,8 @@
final EMFStorePropertyType oldType = type;
type = newType == null ? TYPE_EDEFAULT : newType;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__TYPE, oldType, type));
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__TYPE, oldType, type));
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdEObjectCollectionImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdEObjectCollectionImpl.java
index 0f77858..5fcdfff 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdEObjectCollectionImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdEObjectCollectionImpl.java
@@ -55,6 +55,11 @@
public static final String MODELELEMENTID_GENERATOR_EXTENSIONPOINT = "org.eclipse.emf.emfstore.common.model.modelelementIdGenerator"; //$NON-NLS-1$
/**
+ * The extension point id to configure the {@link ESModelElementIdGenerator}.
+ */
+ public static final String MATERIALIZED_MODELELEMENTID_GENERATOR_EXTENSIONPOINT = "org.eclipse.emf.emfstore.common.model.materializedModelElementIdGenerator"; //$NON-NLS-1$
+
+ /**
* The attribute identifying the class of the {@link ESModelElementIdGenerator} extension point.
*/
public static final String MODELELEMENTID_GENERATOR_CLASS_ATTRIBUTE = "class"; //$NON-NLS-1$
@@ -79,7 +84,6 @@
/**
* Constructor.
*/
- @SuppressWarnings("unchecked")
public IdEObjectCollectionImpl() {
eObjectToIdMap = new LinkedHashMap<EObject, String>();
idToEObjectMap = new LinkedHashMap<String, EObject>();
@@ -87,6 +91,11 @@
allocatedEObjectToIdMap = new LinkedHashMap<EObject, String>();
allocatedIdToEObjectMap = new LinkedHashMap<String, EObject>();
+ initModelElementIdGenerator();
+ }
+
+ @SuppressWarnings("unchecked")
+ private void initModelElementIdGenerator() {
final ESExtensionElement element = new ESExtensionPoint(MODELELEMENTID_GENERATOR_EXTENSIONPOINT)
.getElementWithHighestPriority();
@@ -125,12 +134,8 @@
while (it.hasNext()) {
final EObject eObject = it.next();
- if (ModelUtil.isIgnoredDatatype(eObject)) {
- continue;
- }
-
final String id = xmiResource.getID(eObject);
- final ModelElementId eObjectId = getNewModelElementID();
+ final ModelElementId eObjectId = getNewModelElementID(eObject);
if (id != null) {
eObjectId.setId(id);
@@ -256,7 +261,7 @@
// EObject _is_ project -> assign magic ModelElementId
if (this == eObject) {
- final ModelElementId modelElementId = getNewModelElementID();
+ final ModelElementId modelElementId = getNewModelElementID(eObject);
modelElementId.setId("001"); //$NON-NLS-1$
return modelElementId;
}
@@ -274,7 +279,7 @@
final XMIResource xmiResource = (XMIResource) resource;
ModelUtil.loadResource(xmiResource, ModelUtil.getResourceLogger());
- final ModelElementId modelElementId = getNewModelElementID();
+ final ModelElementId modelElementId = getNewModelElementID(eObject);
final String id = xmiResource.getID(eObject);
if (id != null) {
@@ -291,7 +296,7 @@
}
final String id = eObjectToIdMap.get(eObject);
- final ModelElementId modelElementId = getNewModelElementID();
+ final ModelElementId modelElementId = getNewModelElementID(eObject);
modelElementId.setId(id);
return id != null ? modelElementId : ModelUtil.getSingletonModelElementId(eObject);
@@ -426,14 +431,14 @@
}
final String id = xmiResource.getID(modelElement);
if (id != null) {
- final ModelElementId objId = getNewModelElementID();
+ final ModelElementId objId = getNewModelElementID(modelElement);
objId.setId(id);
return objId;
}
}
// create new ID
- return getNewModelElementID();
+ return getNewModelElementID(modelElement);
}
/**
@@ -648,7 +653,7 @@
if (childId == null) {
// if not, create a new ID
- childId = getNewModelElementID().getId();
+ childId = getNewModelElementID(child).getId();
} else {
removableIds.add(childId);
}
@@ -816,7 +821,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.common.model.IdEObjectCollection#clearAllocatedCaches(java.util.Set)
*/
public void clearAllocatedCaches(Set<ModelElementId> modelElementIds) {
@@ -829,7 +834,7 @@
allocatedIdToEObjectMap.put(modelElementId.getId(), modelElement);
}
- private ModelElementId getNewModelElementID() {
+ private ModelElementId getNewModelElementID(EObject eObject) {
// if there is registered modelElementIdGenerator, use it
if (modelElementIdGenerator != null) {
final ESModelElementIdImpl modelElementId = (ESModelElementIdImpl) modelElementIdGenerator
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdentifiableElementImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdentifiableElementImpl.java
index 7ff39c8..6d02142 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdentifiableElementImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/IdentifiableElementImpl.java
@@ -23,11 +23,11 @@
* end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.IdentifiableElementImpl#getIdentifier <em>Identifier
- * </em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.IdentifiableElementImpl#getIdentifier
+ * <em>Identifier</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelElementIdImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelElementIdImpl.java
index a34272c..b40d893 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelElementIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelElementIdImpl.java
@@ -16,8 +16,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Element Id</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelFactoryImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelFactoryImpl.java
index c7a48d1..e3c66b5 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelFactoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelFactoryImpl.java
@@ -44,7 +44,7 @@
public static ModelFactory init() {
try {
final ModelFactory theModelFactory = (ModelFactory) EPackage.Registry.INSTANCE
- .getEFactory("http://eclipse.org/emf/emfstore/common/model"); //$NON-NLS-1$
+ .getEFactory(ModelPackage.eNS_URI);
if (theModelFactory != null) {
return theModelFactory;
}
@@ -188,10 +188,9 @@
*/
public EMFStorePropertyType createEMFStorePropertyTypeFromString(EDataType eDataType, String initialValue) {
final EMFStorePropertyType result = EMFStorePropertyType.get(initialValue);
- if (result == null)
- {
- throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" //$NON-NLS-1$ //$NON-NLS-2$
- + eDataType.getName() + "'"); //$NON-NLS-1$
+ if (result == null) {
+ throw new IllegalArgumentException(
+ "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
return result;
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelPackageImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelPackageImpl.java
index bd18622..6efd8b4 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelPackageImpl.java
@@ -157,8 +157,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -172,9 +173,9 @@
}
// Obtain or create and register package
- final ModelPackageImpl theModelPackage = (ModelPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new ModelPackageImpl());
+ final ModelPackageImpl theModelPackage = (ModelPackageImpl) (EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new ModelPackageImpl());
isInited = true;
@@ -529,11 +530,11 @@
// Initialize classes and features; add operations and parameters
initEClass(projectEClass, Project.class, "Project", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
initEReference(getProject_ModelElements(), ecorePackage.getEObject(), null, "modelElements", null, 0, -1, //$NON-NLS-1$
- Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
+ Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
initEReference(getProject_CutElements(), ecorePackage.getEObject(), null, "cutElements", null, 0, -1, //$NON-NLS-1$
- Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ Project.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(uniqueIdentifierEClass, UniqueIdentifier.class, "UniqueIdentifier", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
@@ -559,8 +560,8 @@
initEClass(nonDomainElementEClass, NonDomainElement.class, "NonDomainElement", IS_ABSTRACT, IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- initEClass(associationClassElementEClass, AssociationClassElement.class, "AssociationClassElement", //$NON-NLS-1$
- IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEClass(associationClassElementEClass, AssociationClassElement.class, "AssociationClassElement", IS_ABSTRACT, //$NON-NLS-1$
+ IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEClass(emfStorePropertyEClass, EMFStoreProperty.class, "EMFStoreProperty", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelVersionImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelVersionImpl.java
index ca2f8bd..75c4514 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelVersionImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ModelVersionImpl.java
@@ -21,11 +21,11 @@
* <!-- begin-user-doc --> An implementation of the model object '<em><b>Version</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.ModelVersionImpl#getReleaseNumber <em>Release Number
- * </em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.ModelVersionImpl#getReleaseNumber
+ * <em>Release Number</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/NotifiableIdEObjectCollectionImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/NotifiableIdEObjectCollectionImpl.java
index 1ebffec..9f6b6db 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/NotifiableIdEObjectCollectionImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/NotifiableIdEObjectCollectionImpl.java
@@ -14,6 +14,7 @@
package org.eclipse.emf.emfstore.internal.common.model.impl;
import java.io.IOException;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
@@ -145,20 +146,21 @@
if (exceptionThrowingObservers.contains(changeObserver)) {
if (!undetachableObservers.contains(changeObserver)) {
observersToRemove.add(changeObserver);
- ModelUtil.logException(
- Messages.NotifiableIdEObjectCollectionImpl_Exception_Detach
- + changeObserver.getClass().getName(),
- exception);
+ final String msg = MessageFormat.format(
+ Messages.NotifiableIdEObjectCollectionImpl_Exception_Detach,
+ changeObserver.getClass().getName());
+ ModelUtil.logException(msg, exception);
} else {
- ModelUtil.logException(
- Messages.NotifiableIdEObjectCollectionImpl_Exception_NoDetach
- + changeObserver.getClass().getName(),
- exception);
+ final String msg = MessageFormat.format(
+ Messages.NotifiableIdEObjectCollectionImpl_Exception_NoDetach,
+ changeObserver.getClass().getName());
+ ModelUtil.logException(msg, exception);
}
} else {
exceptionThrowingObservers.add(changeObserver);
- ModelUtil.logWarning(Messages.NotifiableIdEObjectCollectionImpl_Exception
- + changeObserver.getClass().getName(), exception);
+ final String msg = MessageFormat.format(Messages.NotifiableIdEObjectCollectionImpl_Exception,
+ changeObserver.getClass().getName());
+ ModelUtil.logWarning(msg, exception);
}
}
};
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyMapEntryImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyMapEntryImpl.java
index 720f042..1a3d051 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyMapEntryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyMapEntryImpl.java
@@ -27,11 +27,12 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl#getTypedKey <em>Key</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl#getTypedValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl#getTypedValue <em>Value</em>}
+ * </li>
* </ul>
- * </p>
*
* @generated
*/
@@ -154,8 +155,8 @@
final EMFStoreProperty oldValue = value;
value = newValue;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROPERTY_MAP_ENTRY__VALUE, oldValue,
- value));
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, ModelPackage.PROPERTY_MAP_ENTRY__VALUE, oldValue, value));
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyStringValueImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyStringValueImpl.java
index 4513807..741ded6 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyStringValueImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/PropertyStringValueImpl.java
@@ -23,10 +23,10 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.common.model.impl.PropertyStringValueImpl#getValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/messages.properties b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/messages.properties
index f8c4586..ea6360c 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/messages.properties
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/messages.properties
@@ -3,3 +3,6 @@
IdEObjectCollectionImpl_ResoruceCouldNotBeLoaded=Resource of model element {0} couldn't be loaded
IdEObjectCollectionImpl_ResourceCouldNotBeSaved=XMI Resource for model element {0} could not be saved. Reason: {1}
IdEObjectCollectionImpl_XMIResourceNotLoaded=XMIResource %s could not be loaded.
+NotifiableIdEObjectCollectionImpl_Exception=Non yet registered exception-throwing IdEObjectCollectionChangeObserver issued exception {0}.
+NotifiableIdEObjectCollectionImpl_Exception_Detach=Observer {0} threw exception and will be removed.
+NotifiableIdEObjectCollectionImpl_Exception_NoDetach=Non-detachable Observer {0} threw exception.
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ChecksumCalculatorWriter.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ChecksumCalculatorWriter.java
new file mode 100644
index 0000000..a925c58
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ChecksumCalculatorWriter.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Marco van Meegen - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.internal.common.model.util;
+
+import java.io.IOException;
+import java.io.Writer;
+
+/**
+ * Calculates the checksum of all bytes streamed by directely computing it during the write operation. This will save
+ * memory, as we do not need multiple versions of a model string.
+ *
+ * @author Marco van Meegen
+ *
+ */
+public class ChecksumCalculatorWriter extends Writer {
+ private long checksum = 1125899906842597L; // prime
+ private long trimmedStringChecksum = -1;
+ private boolean trimmingLeading = true;
+
+ /**
+ * update checksum with bytes written.
+ *
+ * @see java.io.Writer#write(char[], int, int)
+ */
+ @Override
+ public void write(char[] cbuf, int off, int len) throws IOException {
+ for (int idx = 0; idx < len; idx++) {
+ final char c = cbuf[idx + off];
+ // trim leading whitespace <= ' '
+ if (!trimmingLeading || c > ' ') {
+ checksum = 31 * checksum + c;
+ if (c > ' ') {
+ // trimmdStringChecksum will always be the last checksum calculated where a non-whitespace was found
+ trimmedStringChecksum = checksum;
+ }
+ trimmingLeading = false;
+ }
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see java.io.Writer#flush()
+ */
+ @Override
+ public void flush() throws IOException {
+ // ignore
+
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see java.io.Writer#close()
+ */
+ @Override
+ public void close() throws IOException {
+ // ignore
+ }
+
+ /**
+ * @return the checksum calculated for all characters written to the writer
+ */
+ public long getChecksum() {
+ return trimmedStringChecksum != -1 ? trimmedStringChecksum : checksum;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/EObjectChangeNotifier.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/EObjectChangeNotifier.java
index 5078065..8cc631d 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/EObjectChangeNotifier.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/EObjectChangeNotifier.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.util.EContentAdapter;
+import org.eclipse.emf.emfstore.internal.common.model.IdEObjectCollection;
import org.eclipse.emf.emfstore.internal.common.model.impl.NotifiableIdEObjectCollectionImpl;
/**
@@ -84,7 +85,7 @@
final Notification currentNotification = currentNotifications.peek();
if (currentNotification != null && !currentNotification.isTouch() && !isInitializing
- && notifier instanceof EObject && !ModelUtil.isIgnoredDatatype((EObject) notifier)) {
+ && notifier instanceof EObject) {
final EObject modelElement = (EObject) notifier;
if (!collection.contains(modelElement) && isInCollectionHierarchy(modelElement)) {
collection.modelElementAdded(collection, modelElement);
@@ -247,7 +248,7 @@
final EObject eObject = (EObject) obj;
if (!collection.contains(eObject)) {
- collection.addCutElement(eObject);
+ collection.addCutElement(getCutElement(eObject));
}
}
}
@@ -257,10 +258,32 @@
if (ModelUtil.isSingleton(newEObject)) {
return;
}
- collection.addCutElement(newEObject);
+ collection.addCutElement(getCutElement(newEObject));
}
}
+ private EObject getCutElement(EObject eObject) {
+ final EObject referenceElement = eObject;
+ /* find topmost parent */
+ while (eObject.eContainer() != null) {
+ /*
+ * Bug 501971
+ * if we are contained in a different IdEObjectCollection (e.g. a second EMFStore project) simply add the
+ * used element from the reference as a cut element (default before 501971)
+ */
+ if (IdEObjectCollection.class.isInstance(eObject)) {
+ return referenceElement;
+ }
+ eObject = eObject.eContainer();
+ }
+
+ /*
+ * Bug 501971
+ * otherwise move the full containment tree
+ */
+ return eObject;
+ }
+
/**
* @param notification
*/
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/FileUtil.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/FileUtil.java
index 6c1a1bc..3cf4a6b 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/FileUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/FileUtil.java
@@ -130,7 +130,8 @@
zipOutputStream.close();
}
- private static void zip(File current, String rootPath, ZipOutputStream zipStream, byte[] buffer) throws IOException {
+ private static void zip(File current, String rootPath, ZipOutputStream zipStream, byte[] buffer)
+ throws IOException {
if (current.isDirectory()) {
for (final File file : current.listFiles()) {
if (!".".equals(file.getName()) && !"..".equals(file.getName())) { //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelAdapterFactory.java
index 03e25a6..6404b60 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelAdapterFactory.java
@@ -171,8 +171,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier
- * <em>Unique Identifier</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier <em>Unique Identifier</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
@@ -188,8 +187,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement
- * <em>Identifiable Element</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement <em>Identifiable Element</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
@@ -205,8 +203,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.common.model.ModelElementId
- * <em>Element Id</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.common.model.ModelElementId <em>Element Id</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
@@ -238,8 +235,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.common.model.NonDomainElement
- * <em>Non Domain Element</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.common.model.NonDomainElement <em>Non Domain Element</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
@@ -272,8 +268,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty
- * <em>EMF Store Property</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty <em>EMF Store Property</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
@@ -304,8 +299,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue
- * <em>Property String Value</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue <em>Property String Value</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelUtil.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelUtil.java
index 22043f4..d2f9302 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelUtil.java
@@ -16,10 +16,12 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -87,8 +89,6 @@
private static final String SINGLETON_ID_RESOLVER_EXT_POINT_ID = "org.eclipse.emf.emfstore.common.model.singletonIdResolver"; //$NON-NLS-1$
- private static final String IGNORED_DATATYPE_EXT_POINT_ID = "org.eclipse.emf.emfstore.common.model.ignoreDatatype"; //$NON-NLS-1$
-
/**
* Constant that may be used in case no checksum computation has taken place.
*/
@@ -119,11 +119,6 @@
};
/**
- * Contains the canonical names of classes which will be ignored.
- */
- private static Set<String> ignoredDataTypes;
-
- /**
* Contains all ID resolvers for singleton datatypes.
*/
private static Set<ESSingletonIdResolver> singletonIdResolvers;
@@ -131,6 +126,8 @@
private static HashMap<Object, Object> resourceSaveOptions;
private static Map<Object, Object> checksumSaveOptions;
+ private static SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); //$NON-NLS-1$
+
/**
* Private constructor.
*/
@@ -281,15 +278,13 @@
* @throws SerializationException
* in case any errors occur during computation of the checksum
*/
- private static long computeChecksum(String eObjectString) {
+ private static long computeChecksumLegacy(String eObjectString) {
long h = 1125899906842597L; // prime
final int len = eObjectString.length();
for (int i = 0; i < len; i++) {
final char c = eObjectString.charAt(i);
-
h = 31 * h + c;
-
}
return h;
@@ -305,8 +300,54 @@
* @throws SerializationException
* in case any errors occur during computation of the checksum
*/
+ public static long computeChecksumLegacy(EObject eObject) throws SerializationException {
+ return computeChecksumLegacy(eObjectToString(eObject, getChecksumSaveOptions()));
+ }
+
+ /**
+ * Converts the given {@link EObject} to a string.
+ *
+ * @param copy The copied {@link EObject}.
+ * @param resource The resource for the {@link EObject}.
+ * @param saveOptions define the format of the returned serialization.
+ * @return The checksum of the serialized {@link EObject}.
+ * @throws SerializationException If a serialization problem occurs.
+ */
+ private static long computeChecksumForCopiedEObject(EObject copy, XMIResource resource, Map<?, ?> saveOptions)
+ throws SerializationException {
+ resource.getContents().add(copy);
+
+ final ChecksumCalculatorWriter checksumCalculatorWriter = new ChecksumCalculatorWriter();
+ final URIConverter.WriteableOutputStream uws = new URIConverter.WriteableOutputStream(checksumCalculatorWriter,
+ CommonUtil.getEncoding());
+
+ try {
+ resource.save(uws, saveOptions);
+ } catch (final IOException e) {
+ throw new SerializationException(e);
+ } finally {
+ try {
+ uws.close();
+ } catch (final IOException exception) {
+ logException(exception);
+ }
+ }
+
+ return checksumCalculatorWriter.getChecksum();
+ }
+
+ /**
+ * Computes the checksum for a given {@link EObject}.
+ *
+ * @param eObject
+ * the EObject for which to compute a checksum
+ * @return the computed checksum
+ *
+ * @throws SerializationException
+ * in case any errors occur during computation of the checksum
+ */
public static long computeChecksum(EObject eObject) throws SerializationException {
- return computeChecksum(eObjectToString(eObject, getChecksumSaveOptions()));
+ return computeChecksumInternal(eObject, false);
}
/**
@@ -322,23 +363,32 @@
* in case any errors occur during computation of the checksum
*/
public static long computeChecksum(IdEObjectCollection collection) throws SerializationException {
+ return computeChecksumInternal(collection, true);
+ }
+ private static long computeChecksumInternal(EObject eObject, boolean sort) throws SerializationException {
final ResourceSetImpl resourceSetImpl = new ResourceSetImpl();
// TODO: do we need to instantiate the factory registry each time?
resourceSetImpl.setResourceFactoryRegistry(new ResourceFactoryRegistry());
final XMIResource res = (XMIResource) resourceSetImpl.createResource(VIRTUAL_URI);
((ResourceImpl) res).setIntrinsicIDToEObjectMap(new HashMap<String, EObject>());
- final IdEObjectCollection copy = copyIdEObjectCollection(collection, res);
-
- ECollections.sort(copy.getModelElements(), new Comparator<EObject>() {
- public int compare(EObject o1, EObject o2) {
- return copy.getModelElementId(o1).getId().compareTo(copy.getModelElementId(o2).getId());
+ EObject copy;
+ if (eObject instanceof IdEObjectCollection) {
+ copy = copyIdEObjectCollection((IdEObjectCollection) eObject, res);
+ final IdEObjectCollection castedCopy = (IdEObjectCollection) copy;
+ if (sort) {
+ ECollections.sort(castedCopy.getModelElements(), new Comparator<EObject>() {
+ public int compare(EObject o1, EObject o2) {
+ return castedCopy.getModelElementId(o1).getId()
+ .compareTo(castedCopy.getModelElementId(o2).getId());
+ }
+ });
}
- });
+ } else {
+ copy = copyEObject(ModelUtil.getProject(eObject), eObject, res);
+ }
- final String serialized = copiedEObjectToString(copy, res);
-
- return computeChecksum(serialized);
+ return computeChecksumForCopiedEObject(copy, res, getChecksumSaveOptions());
}
/**
@@ -363,19 +413,19 @@
final IdEObjectCollection copiedCollection = clone(collection);
for (final EObject modelElement : copiedCollection.getAllModelElements()) {
- if (isIgnoredDatatype(modelElement)) {
+ final ModelElementId modelElementId = copiedCollection.getModelElementId(modelElement);
+ if (modelElementId == null) {
continue;
}
- final ModelElementId modelElementId = copiedCollection.getModelElementId(modelElement);
res.setID(modelElement, modelElementId.getId());
}
for (final EObject modelElement : ((Project) copiedCollection).getCutElements()) {
- if (isIgnoredDatatype(modelElement)) {
- continue;
- }
final ModelElementId modelElementId = ((IdEObjectCollectionImpl) copiedCollection)
.getModelElementId(modelElement);
+ if (modelElementId == null) {
+ continue;
+ }
res.setID(modelElement, modelElementId.getId());
}
@@ -390,30 +440,6 @@
}
/**
- * Determines whether the type of an EObject is an ignored one.
- *
- * @param eObject
- * the EObject which is to be checked
- * @return true, if the EObject will be ignored, false otherwise
- */
- public static synchronized boolean isIgnoredDatatype(EObject eObject) {
-
- if (ignoredDataTypes == null) {
- ignoredDataTypes = new LinkedHashSet<String>();
- for (final ESExtensionElement element : new ESExtensionPoint(
- IGNORED_DATATYPE_EXT_POINT_ID,
- true).getExtensionElements()) {
- try {
- ignoredDataTypes.add(element.getAttribute("type")); //$NON-NLS-1$
- } catch (final ESExtensionPointException e) {
- }
- }
- }
-
- return ignoredDataTypes.contains(eObject.eClass().getInstanceClassName());
- }
-
- /**
* Delivers a map of options for loading resources. Especially {@link XMLResource#OPTION_DEFER_IDREF_RESOLUTION}
* which speeds up loading
* due to our id based resources.
@@ -698,6 +724,37 @@
}
/**
+ * Logs detailed information about the project state.
+ *
+ * @param message the message
+ * @param user the user name
+ * @param projectName the project name
+ * @param projectId the project id
+ * @param branch the branch
+ * @param revision the revision
+ */
+ public static void logProjectDetails(
+ String message,
+ String user,
+ String projectName,
+ String projectId,
+ String branch,
+ int revision) {
+ if (!Boolean.getBoolean("emfstore.logDetails")) { //$NON-NLS-1$
+ return;
+ }
+ logInfo(MessageFormat.format(
+ "Time: {0} | Msg: {1} | User: {2} | Project Name: {3} | Project Id: {4} | Branch: {5} | Revision: {6}", //$NON-NLS-1$
+ dateFormat.format(new Date()),
+ message != null ? message : "", //$NON-NLS-1$
+ user != null ? user : "not available", //$NON-NLS-1$
+ projectName != null ? projectName : "not available", //$NON-NLS-1$
+ projectId != null ? projectId : "not available", //$NON-NLS-1$
+ branch != null ? branch : "not available", //$NON-NLS-1$
+ revision != -1 ? revision : "not available")); //$NON-NLS-1$
+ }
+
+ /**
* Clone any EObject.
*
* @param <T>
@@ -772,7 +829,7 @@
@SuppressWarnings("unchecked")
public static <T extends EObject> T loadEObjectFromResource(EClass eClass, URI resourceURI,
boolean checkConstraints)
- throws IOException {
+ throws IOException {
final ResourceSet resourceSet = getResourceSetForURI(resourceURI);
@@ -1299,8 +1356,7 @@
return false;
}
- return !ModelUtil.isSingleton(referencedElement) && !ModelUtil.isIgnoredDatatype(referencedElement)
- && !allModelElements.contains(referencedElement);
+ return !ModelUtil.isSingleton(referencedElement) && !allModelElements.contains(referencedElement);
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.common/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
index 66edeac..c691495 100644
--- a/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Common
Bundle-SymbolicName: org.eclipse.emf.emfstore.common;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: org.eclipse.emf.emfstore.internal.common.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
@@ -10,13 +10,13 @@
Bundle-ActivationPolicy: lazy
Export-Package: com.google.common.base;version="10.0.1",com.google.com
mon.collect;version="10.0.1",com.google.common.io;version="2.2.0",org
- .apache.commons.io;version="1.8.1",org.apache.commons.io.comparator;v
+ .apache.commons.io;version="1.9.0",org.apache.commons.io.comparator;v
ersion="2.0.1",org.apache.commons.io.filefilter;version="2.0.1",org.a
pache.commons.io.input;version="2.0.1",org.apache.commons.io.monitor;
- version="2.0.1",org.apache.commons.io.output;version="1.8.1",org.apac
- he.commons.lang;version="1.8.1",org.eclipse.emf.emfstore.common;versi
- on="1.8.1",org.eclipse.emf.emfstore.common.extensionpoint;version="1.
- 8.1",org.eclipse.emf.emfstore.internal.common;version="1.8.1"; x-frie
+ version="2.0.1",org.apache.commons.io.output;version="1.9.0",org.apac
+ he.commons.lang;version="1.9.0",org.eclipse.emf.emfstore.common;versi
+ on="1.9.0",org.eclipse.emf.emfstore.common.extensionpoint;version="1.
+ 9.0",org.eclipse.emf.emfstore.internal.common;version="1.9.0"; x-frie
nds:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfstore.clie
nt.test.ui, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.emf
store.common.model, org.eclipse.emf.emfstore.example.merging, org.e
@@ -25,7 +25,7 @@
ient.test.common, org.eclipse.emf.emfstore.test.common, org.eclipse
.emf.emfstore.client.recording.test, org.eclipse.emf.emfstore.server
.test, org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfstor
- e.internal.common.api;version="1.8.1"; x-friends:="org.eclipse.emf.em
+ e.internal.common.api;version="1.9.0"; x-friends:="org.eclipse.emf.em
fstore.client, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.
emfstore.common.model, org.eclipse.emf.emfstore.ecore, org.eclipse.
emf.emfstore.example.merging, org.eclipse.emf.emfstore.fuzzy.emf.tes
@@ -37,7 +37,7 @@
ecp.emfstore.ui.e3, org.eclipse.emf.emfstore.client.api.test, org.e
clipse.emf.emfstore.fuzzy.emf, org.eclipse.emf.emfstore.client.test,
org.eclipse.emf.emfstore.client.test.ui",org.eclipse.emf.emfstore.i
- nternal.common.observer;version="1.8.1"; x-friends:="org.eclipse.emf.
+ nternal.common.observer;version="1.9.0"; x-friends:="org.eclipse.emf.
emfstore.client, org.eclipse.emf.emfstore.client.test.ui, org.eclip
se.emf.emfstore.client.ui, org.eclipse.emf.emfstore.client.recording
.test, org.eclipse.emf.emfstore.client.test"
diff --git a/bundles/org.eclipse.emf.emfstore.common/pom.xml b/bundles/org.eclipse.emf.emfstore.common/pom.xml
index 3b88a26..4dca819 100644
--- a/bundles/org.eclipse.emf.emfstore.common/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.common/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.common</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/APIUtil.java b/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/APIUtil.java
index a02fe48..26339a0 100644
--- a/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/APIUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/APIUtil.java
@@ -66,8 +66,8 @@
* @param <API> the type of the API interface
* @param <IMPL> the type of the API implementation class
*/
- public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API>
- List<INT> toInternal(List<API> toCopy) {
+ public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API> List<INT> toInternal(
+ List<API> toCopy) {
if (toCopy == null) {
return null;
@@ -98,8 +98,8 @@
* @param <API> the type of the API interface
* @param <IMPL> the type of the API implementation class
*/
- public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API, DESIRED>
- List<INT> toInternal(Class<DESIRED> cls, List<API> toCopy) {
+ public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API, DESIRED> List<INT> toInternal(
+ Class<DESIRED> cls, List<API> toCopy) {
if (toCopy == null) {
return null;
@@ -127,8 +127,8 @@
* @param <API> the type of the API interface
* @param <IMPL> the type of the API implementation class
*/
- public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API>
- List<API> toExternal(List<INT> toCopy) {
+ public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API> List<API> toExternal(
+ List<INT> toCopy) {
if (toCopy == null) {
return null;
@@ -154,8 +154,8 @@
* @param <API> the type of the API interface
* @param <IMPL> the type of the API implementation class
*/
- public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API>
- Set<API> toExternal(Set<INT> toCopy) {
+ public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API> Set<API> toExternal(
+ Set<INT> toCopy) {
if (toCopy == null) {
return null;
@@ -247,8 +247,8 @@
* @param <API> the type of the API interface
* @param <IMPL> the type of the API implementation class
*/
- public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API>
- Set<INT> toInternal(Set<API> toCopy) {
+ public static <IMPL extends InternalAPIDelegator<API, INT>, INT extends APIDelegate<API>, API> Set<INT> toInternal(
+ Set<API> toCopy) {
if (toCopy == null) {
return null;
diff --git a/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/observer/ObserverBus.java b/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/observer/ObserverBus.java
index 2ad36c9..6ab65f3 100644
--- a/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/observer/ObserverBus.java
+++ b/bundles/org.eclipse.emf.emfstore.common/src/org/eclipse/emf/emfstore/internal/common/observer/ObserverBus.java
@@ -53,34 +53,34 @@
* <pre>
* // A is ESObserver
* A a = new A() {
- *
+ *
* public void foo() {
* System.out.println("A says: go!");
* }
* };
- *
+ *
* // B extends A and is ESObserver
* B b = new B() {
- *
+ *
* public void say(String ja) {
* System.out.println("B says: " + ja);
* }
- *
+ *
* public void foo() {
* System.out.println("B says: h??");
* }
* };
- *
+ *
* // B is registered first
* ObserverBus.register(b);
* ObserverBus.register(a);
- *
+ *
* ObserverBus.notify(A.class).foo();
- *
+ *
* ObserverBus.notify(B.class).say("w00t");
- *
+ *
* // Output:
- *
+ *
* // B says: h??
* // A says: go!
* //
@@ -381,11 +381,11 @@
public void collectionExtensionPoints() {
for (final ESExtensionElement outer : new ESExtensionPoint(
EXTENSION_POINT_ID, true)
- .getExtensionElements()) {
+ .getExtensionElements()) {
try {
for (final ESExtensionElement inner : new ESExtensionPoint(outer.getAttribute("extensionPointName"), //$NON-NLS-1$
true)
- .getExtensionElements()) {
+ .getExtensionElements()) {
register(inner.getClass(outer.getAttribute("observerAttributeName"), ESObserver.class)); //$NON-NLS-1$
}
} catch (final ESExtensionPointException e) {
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.checkstyle b/bundles/org.eclipse.emf.emfstore.ecore/.checkstyle
deleted file mode 100644
index 9f196dc..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/.checkstyle
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
- <local-check-config name="ESM Checkstyle" location="/EMFStoreDeveloper/checkstyle/esmCheckstyle.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
- </local-check-config>
- <fileset name="all Java Files" enabled="true" check-config-name="ESM Checkstyle" local="true">
- <file-match-pattern match-pattern=".java" include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.classpath b/bundles/org.eclipse.emf.emfstore.ecore/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.project b/bundles/org.eclipse.emf.emfstore.ecore/.project
deleted file mode 100644
index f0de0df..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.ecore</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/.api_filters b/bundles/org.eclipse.emf.emfstore.ecore/.settings/.api_filters
deleted file mode 100644
index b59639b..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/.settings/.api_filters
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<component id="org.eclipse.emf.emfstore.ecore" version="2">
- <resource path="src/org/eclipse/emf/emfstore/internal/ecore/EDatatypeIdResolver.java" type="org.eclipse.emf.emfstore.internal.ecore.EDatatypeIdResolver">
- <filter comment="internal API usage" id="574619656">
- <message_arguments>
- <message_argument value="ESSingletonIdResolver"/>
- <message_argument value="EDatatypeIdResolver"/>
- </message_arguments>
- </filter>
- </resource>
- <resource path="src/org/eclipse/emf/emfstore/internal/ecore/ETypeIdResolver.java" type="org.eclipse.emf.emfstore.internal.ecore.ETypeIdResolver">
- <filter comment="internal API usage" id="574619656">
- <message_arguments>
- <message_argument value="ESSingletonIdResolver"/>
- <message_argument value="ETypeIdResolver"/>
- </message_arguments>
- </filter>
- </resource>
-</component>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c3dffe..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,418 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=abort
-org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
-org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
-org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
-org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
-org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
-org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
-org.eclipse.jdt.core.compiler.problem.deadCode=warning
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
-org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=warning
-org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
-org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
-org.eclipse.jdt.core.compiler.problem.nullReference=warning
-org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
-org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
-org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
-org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
-org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=0
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
-org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.format_block_comments=true
-org.eclipse.jdt.core.formatter.comment.format_header=true
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
-org.eclipse.jdt.core.formatter.comment.format_line_comments=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
-org.eclipse.jdt.core.formatter.comment.line_length=120
-org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
-org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=1
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
-org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
-org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
-org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.join_lines_in_comments=false
-org.eclipse.jdt.core.formatter.join_wrapped_lines=false
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=120
-org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
-org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
deleted file mode 100644
index 55d030e..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: EMFStore ECore Integration
-Bundle-SymbolicName: org.eclipse.emf.emfstore.ecore;singleton:=true
-Bundle-Version: 1.8.1.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.emf.emfstore.internal.ecore.Activator
-Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.internal.ecore;version="1.8.1
- ";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/about.html b/bundles/org.eclipse.emf.emfstore.ecore/about.html
deleted file mode 100644
index d35d5ae..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 5, 2007</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
-being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was
-provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/about.ini b/bundles/org.eclipse.emf.emfstore.ecore/about.ini
deleted file mode 100644
index 381e8d4..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/about.ini
+++ /dev/null
@@ -1,14 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/about.mappings b/bundles/org.eclipse.emf.emfstore.ecore/about.mappings
deleted file mode 100644
index 4cd8b45..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/about.mappings
+++ /dev/null
@@ -1 +0,0 @@
-0=1.0.0
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/about.properties b/bundles/org.eclipse.emf.emfstore.ecore/about.properties
deleted file mode 100644
index dce29ec..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/about.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-featureName=EMFStore
-
-featureText=EMFStore\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright 2011-2016 EclipseSource Munich GmbH and others, \n\
-and\n\
-(c) Copyright 2008-2011 Lehrstuhl für angewandte Softwaretechnik, \n\
-Technische Universitaet Muenchen. All rights reserved.
-This program and the accompanying materials are made available\n\
-under the terms of the Eclipse Public License v1.0 which accompanies this\n\
-distribution, and is available at http://www.eclipse.org/legal/epl-v10.html \n\
-\n\
-EMFStore - A model repository for EMF.\n\
-Visit http://emfstore.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/build.properties b/bundles/org.eclipse.emf.emfstore.ecore/build.properties
deleted file mode 100644
index ee91e08..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- about.ini,\
- about.mappings,\
- about.properties,\
- about.html,\
- modeling32.png
-src.includes = about.html
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/modeling32.png b/bundles/org.eclipse.emf.emfstore.ecore/modeling32.png
deleted file mode 100644
index 6b08de2..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/modeling32.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/plugin.xml b/bundles/org.eclipse.emf.emfstore.ecore/plugin.xml
deleted file mode 100644
index 1b9dc40..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.emf.emfstore.common.model.singletonIdResolver">
- <singletonidresolver
- class="org.eclipse.emf.emfstore.internal.ecore.EDatatypeIdResolver">
- </singletonidresolver>
- </extension>
- <extension
- point="org.eclipse.emf.emfstore.common.model.ignoreDatatype">
- <ignoredatatype
- type="org.eclipse.emf.ecore.EGenericType">
- </ignoredatatype>
- </extension>
- <extension
- point="org.eclipse.emf.emfstore.common.model.singletonIdResolver">
- <singletonidresolver
- class="org.eclipse.emf.emfstore.internal.ecore.ETypeIdResolver">
- </singletonidresolver>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/pom.xml b/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
deleted file mode 100644
index b2f4cd9..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.emf.emfstore</groupId>
- <artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
- </parent>
- <groupId>org.eclipse.emf.emfstore</groupId>
- <artifactId>org.eclipse.emf.emfstore.ecore</artifactId>
- <version>1.8.1-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
-</project>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/Activator.java b/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/Activator.java
deleted file mode 100644
index d14488e..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/Activator.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
- * Technische Universitaet Muenchen.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- ******************************************************************************/
-package org.eclipse.emf.emfstore.internal.ecore;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle.
- */
-public class Activator extends Plugin {
-
- /**
- * The plug-in ID.
- */
- public static final String PLUGIN_ID = "org.eclipse.emf.emfstore.ecore"; //$NON-NLS-1$
-
- /**
- * The shared instance.
- */
- private static Activator plugin;
-
- /**
- * The constructor.
- */
- public Activator() {
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
- */
- // BEGIN SUPRESS CATCH EXCEPTION
- @Override
- public void start(BundleContext context) throws Exception {
- super.start(context);
- plugin = this;
- }
-
- // END SUPRESS CATCH EXCEPTION
-
- /**
- * {@inheritDoc}
- *
- * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
- */
- // BEGIN SUPRESS CATCH EXCEPTION
- @Override
- public void stop(BundleContext context) throws Exception {
- plugin = null;
- super.stop(context);
- }
-
- // END SUPRESS CATCH EXCEPTION
-
- /**
- * Returns the shared instance.
- *
- * @return the shared instance
- */
- public static Activator getDefault() {
- return plugin;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/EDatatypeIdResolver.java b/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/EDatatypeIdResolver.java
deleted file mode 100644
index f305250..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/EDatatypeIdResolver.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
- * Technische Universitaet Muenchen.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * emueller
- ******************************************************************************/
-package org.eclipse.emf.emfstore.internal.ecore;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.emfstore.common.model.ESModelElementId;
-import org.eclipse.emf.emfstore.common.model.ESSingletonIdResolver;
-import org.eclipse.emf.emfstore.internal.common.model.ModelElementId;
-import org.eclipse.emf.emfstore.internal.common.model.ModelFactory;
-
-/**
- * An implementation of a {@link ESSingletonIdResolver} that treats all {@link EDataType}s as singletons.
- *
- * @author emueller
- *
- */
-public class EDatatypeIdResolver implements ESSingletonIdResolver {
-
- private final Map<String, EDataType> datatypes = new LinkedHashMap<String, EDataType>();
-
- /**
- * Default constructor.
- */
- public EDatatypeIdResolver() {
- datatypes.put("Literal", EcorePackage.eINSTANCE.getEString()); //$NON-NLS-1$
- // String
- datatypes.put("String", EcorePackage.eINSTANCE.getEString()); //$NON-NLS-1$
- datatypes.put("EString", EcorePackage.eINSTANCE.getEString()); //$NON-NLS-1$
- // Date
- datatypes.put("Date", EcorePackage.eINSTANCE.getEDate()); //$NON-NLS-1$
- datatypes.put("EDate", EcorePackage.eINSTANCE.getEDate()); //$NON-NLS-1$
- // integer
- datatypes.put("Int", EcorePackage.eINSTANCE.getEInt()); //$NON-NLS-1$
- datatypes.put("EInt", EcorePackage.eINSTANCE.getEInt()); //$NON-NLS-1$
- datatypes.put("Integer", EcorePackage.eINSTANCE.getEIntegerObject()); //$NON-NLS-1$
- datatypes.put("EInteger", EcorePackage.eINSTANCE.getEIntegerObject()); //$NON-NLS-1$
- datatypes.put("EIntegerObject", EcorePackage.eINSTANCE.getEIntegerObject()); //$NON-NLS-1$
- // double
- datatypes.put("Double", EcorePackage.eINSTANCE.getEDouble()); //$NON-NLS-1$
- datatypes.put("EDouble", EcorePackage.eINSTANCE.getEDouble()); //$NON-NLS-1$
- datatypes.put("EDoubleObject", EcorePackage.eINSTANCE.getEDoubleObject()); //$NON-NLS-1$
- // long
- datatypes.put("Long", EcorePackage.eINSTANCE.getELong()); //$NON-NLS-1$
- datatypes.put("ELong", EcorePackage.eINSTANCE.getELong()); //$NON-NLS-1$
- datatypes.put("ELongObject", EcorePackage.eINSTANCE.getELongObject()); //$NON-NLS-1$
- // float
- datatypes.put("Float", EcorePackage.eINSTANCE.getEFloat()); //$NON-NLS-1$
- datatypes.put("EFloat", EcorePackage.eINSTANCE.getEFloat()); //$NON-NLS-1$
- datatypes.put("EFloatObject", EcorePackage.eINSTANCE.getEFloatObject()); //$NON-NLS-1$
- // short
- datatypes.put("Short", EcorePackage.eINSTANCE.getEShort()); //$NON-NLS-1$
- datatypes.put("EShort", EcorePackage.eINSTANCE.getEShort()); //$NON-NLS-1$
- datatypes.put("EShortObject", EcorePackage.eINSTANCE.getEShortObject()); //$NON-NLS-1$
- // boolean
- datatypes.put("Boolean", EcorePackage.eINSTANCE.getEBoolean()); //$NON-NLS-1$
- datatypes.put("EBoolean", EcorePackage.eINSTANCE.getEBoolean()); //$NON-NLS-1$
- datatypes.put("EBooleanObject", EcorePackage.eINSTANCE.getEBooleanObject()); //$NON-NLS-1$
- // byte
- datatypes.put("Byte", EcorePackage.eINSTANCE.getEByte()); //$NON-NLS-1$
- datatypes.put("EByte", EcorePackage.eINSTANCE.getEByte()); //$NON-NLS-1$
- datatypes.put("EByteObject", EcorePackage.eINSTANCE.getEByteObject()); //$NON-NLS-1$
- datatypes.put("EByteArray", EcorePackage.eINSTANCE.getEByteArray()); //$NON-NLS-1$
- // char
- datatypes.put("EChar", EcorePackage.eINSTANCE.getEChar()); //$NON-NLS-1$
- datatypes.put("ECharacterObject", EcorePackage.eINSTANCE.getECharacterObject()); //$NON-NLS-1$
- datatypes.put("EBigDecimal", EcorePackage.eINSTANCE.getEBigDecimal()); //$NON-NLS-1$
- datatypes.put("EBigInteger", EcorePackage.eINSTANCE.getEBigInteger()); //$NON-NLS-1$
- }
-
- /**
- * {@inheritDoc}
- */
- public EObject getSingleton(ESModelElementId singletonId) {
-
- if (singletonId == null) {
- return null;
- }
-
- return datatypes.get(singletonId.getId());
- }
-
- /**
- * {@inheritDoc}
- *
- * @return the {@link ESModelElementId} of the the singleton object or <code>null</code> if the given
- * {@link EObject} is not a singleton, is not an instance of {@link EDataType} or is <code>null</code>
- */
- public ESModelElementId getSingletonModelElementId(EObject singleton) {
-
- if (!EDataType.class.isInstance(singleton)) {
- return null;
- }
-
- // TODO: EM, provide 2nd map for performance reasons
- for (final Map.Entry<String, EDataType> entry : datatypes.entrySet()) {
- if (entry.getValue() != singleton) {
- continue;
- }
-
- // TODO: don't create IDs on the fly rather put them directly into the map
- final ModelElementId id = ModelFactory.eINSTANCE.createModelElementId();
- id.setId(entry.getKey());
- return id.toAPI();
- }
-
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isSingleton(EObject eDataType) {
-
- if (!EDataType.class.isInstance(eDataType)) {
- return false;
- }
-
- return datatypes.containsValue(eDataType);
- }
-}
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/ETypeIdResolver.java b/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/ETypeIdResolver.java
deleted file mode 100644
index 0f295d6..0000000
--- a/bundles/org.eclipse.emf.emfstore.ecore/src/org/eclipse/emf/emfstore/internal/ecore/ETypeIdResolver.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- ******************************************************************************/
-package org.eclipse.emf.emfstore.internal.ecore;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.emfstore.common.model.ESModelElementId;
-import org.eclipse.emf.emfstore.common.model.ESSingletonIdResolver;
-import org.eclipse.emf.emfstore.internal.common.model.ModelElementId;
-import org.eclipse.emf.emfstore.internal.common.model.ModelFactory;
-
-/**
- *
- *
- */
-public class ETypeIdResolver implements ESSingletonIdResolver {
-
- private final Map<String, EClass> datatypes = new LinkedHashMap<String, EClass>();
-
- /**
- * Constructor.
- */
- public ETypeIdResolver() {
- // eclass stuff
- datatypes.put("EClass", EcorePackage.eINSTANCE.getEClass()); //$NON-NLS-1$
- datatypes.put("EStructuralFeature", EcorePackage.eINSTANCE.getEStructuralFeature()); //$NON-NLS-1$
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.common.model.ESSingletonIdResolver#getSingleton(org.eclipse.emf.emfstore.common.model.ESModelElementId)
- */
- public EObject getSingleton(ESModelElementId singletonId) {
- if (singletonId == null) {
- return null;
- }
-
- return datatypes.get(singletonId.getId());
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.common.model.ESSingletonIdResolver#getSingletonModelElementId(org.eclipse.emf.ecore.EObject)
- */
- public ESModelElementId getSingletonModelElementId(EObject singleton) {
- if (!(singleton instanceof EClass || EStructuralFeature.class.isInstance(singleton)) || singleton == null) {
- return null;
- }
-
- // TODO: EM, provide 2nd map for performance reasons
- for (final Map.Entry<String, EClass> entry : datatypes.entrySet()) {
- if (!entry.getValue().isInstance(singleton)) {
- continue;
- }
-
- // TODO: don't create IDs on the fly rather put them directly into the map
- final ModelElementId id = ModelFactory.eINSTANCE.createModelElementId();
- id.setId(entry.getKey());
- return id.toAPI();
- }
-
- return null;
- }
-
- /**
- *
- * {@inheritDoc}
- *
- * @see org.eclipse.emf.emfstore.common.model.ESSingletonIdResolver#isSingleton(org.eclipse.emf.ecore.EObject)
- */
- public boolean isSingleton(EObject eDataType) {
- return EClass.class.isInstance(eDataType) || EStructuralFeature.class.isInstance(eDataType);
- }
-
-}
diff --git a/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
index fe8dfc7..2d4ed7d 100644
--- a/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Example Hello World
Bundle-SymbolicName: org.eclipse.emf.emfstore.example.helloworld;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.5.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.5.0,2.0.0)",
@@ -10,4 +10,4 @@
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Export-Package: org.eclipse.emf.emfstore.example.helloworld;version="1
- .8.1"
+ .9.0"
diff --git a/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml b/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
index 52b7d20..848465f 100644
--- a/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.helloworld/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.example.helloworld</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
index bafb5bd..5ab9dd2 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore example installer
Bundle-SymbolicName: org.eclipse.emf.emfstore.example.installer;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.jdt.ui.prefs
index 0197a50..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
eclipse.preferences.version=1
-formatter_profile=_emfstoreFormatter
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
index a9a0ca4..907cfa8 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Example Hello World
Bundle-SymbolicName: org.eclipse.emf.emfstore.example.helloworld;singleton:=true
-Bundle-Version: 1.8.1.qualifier
-Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.1,2.0.0)",
+Bundle-Version: 1.9.0.qualifier
+Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.example.helloworld;version="1.8.1";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
+Export-Package: org.eclipse.emf.emfstore.example.helloworld;version="1.9.0";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
index 52b7d20..848465f 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.example.helloworld</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/example/helloworld/Application.java b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/example/helloworld/Application.java
index 45a52a0..5460e07 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/example/helloworld/Application.java
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.helloworld/src/org/eclipse/emf/emfstore/example/helloworld/Application.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Florian Pirchner
* Maximilian Koegel
@@ -44,13 +44,13 @@
try {
// Create a client representation for a local server and start a local server.
- ESServer localServer = ESServer.FACTORY.createAndStartLocalServer();
+ final ESServer localServer = ESServer.FACTORY.createAndStartLocalServer();
// Run a client on the local server that shows the basic features of the EMFstore
runClient(localServer);
- } catch (ESServerStartFailedException e) {
+ } catch (final ESServerStartFailedException e) {
System.out.println("Server start failed!");
e.printStackTrace();
- } catch (ESException e) {
+ } catch (final ESException e) {
// If there is a problem with the connection to the server,
// e.g., a network, a specific EMFStoreException will be thrown.
System.out.println("Connection to Server failed!");
@@ -61,7 +61,7 @@
/**
* Run an EMFStore Client connecting to the given server.
- *
+ *
* @param server the server
* @throws ESException if the server connection fails
*/
@@ -71,18 +71,18 @@
// The workspace is the core controller to access local and remote projects.
// A project is a container for models and their elements (EObjects).
// To get started, we obtain the current workspace of the client.
- ESWorkspace workspace = ESWorkspaceProvider.INSTANCE.getWorkspace();
+ final ESWorkspace workspace = ESWorkspaceProvider.INSTANCE.getWorkspace();
// The workspace stores all available servers that have been configured. We add the local server that has
// already
// been started on the workspace.
workspace.addServer(server);
// Next, we remove all other existing servers
- for (ESServer existingServer : workspace.getServers()) {
+ for (final ESServer existingServer : workspace.getServers()) {
if (existingServer != server) {
try {
workspace.removeServer(existingServer);
- } catch (ESServerNotFoundException e) {
+ } catch (final ESServerNotFoundException e) {
e.printStackTrace();
}
}
@@ -91,14 +91,14 @@
// The workspace also contains a list of local projects that have either been created locally or checked out
// from a server.
// We create a new local project. The project new created is not yet shared with the server.
- ESLocalProject demoProject = workspace.createLocalProject("DemoProject");
+ final ESLocalProject demoProject = workspace.createLocalProject("DemoProject");
// We delete all projects from the local workspace other than the one just created.
- for (ESLocalProject existingLocalProject : workspace.getLocalProjects()) {
+ for (final ESLocalProject existingLocalProject : workspace.getLocalProjects()) {
if (existingLocalProject != demoProject) {
try {
existingLocalProject.delete(new ESSystemOutProgressMonitor());
- } catch (IOException e) {
+ } catch (final IOException e) {
e.printStackTrace();
}
}
@@ -106,15 +106,16 @@
// Next, we create a user session by logging in to the local EMFStore server with default super user
// credentials.
- ESUsersession usersession = server.login("super", "super");
+ final ESUsersession usersession = server.login("super", "super");
// Now we can share the created local project to our server.
- ESRemoteProject remoteDemoProject = demoProject.shareProject(usersession, new ESSystemOutProgressMonitor());
+ final ESRemoteProject remoteDemoProject = demoProject.shareProject(usersession,
+ new ESSystemOutProgressMonitor());
// We also retrieve a list of existing (and accessible) remote projects on the server.
// Remote projects represent a project that is currently available on the server.
// We delete all remote projects to clean up remaining projects from previous launches.
- for (ESRemoteProject existingRemoteProject : server.getRemoteProjects(usersession)) {
+ for (final ESRemoteProject existingRemoteProject : server.getRemoteProjects(usersession)) {
if (!existingRemoteProject.getGlobalProjectId().equals(remoteDemoProject.getGlobalProjectId())) {
existingRemoteProject.delete(usersession, new NullProgressMonitor());
}
@@ -124,7 +125,7 @@
// server with only this one project.
// We check out a second, independent copy of the project (simulating a second client).
- ESLocalProject demoProjectCopy = demoProject.getRemoteProject().checkout("DemoProject Copy",
+ final ESLocalProject demoProjectCopy = demoProject.getRemoteProject().checkout("DemoProject Copy",
usersession, new ESSystemOutProgressMonitor());
// We start working now with the local project and later we will synchronize it with the copy of the project we
@@ -136,7 +137,7 @@
// project. We will use an example model about bowling.
// First we add a league and set the league name.
- League league = BowlingFactory.eINSTANCE.createLeague();
+ final League league = BowlingFactory.eINSTANCE.createLeague();
league.setName("Suprbowling League");
// Next we add the league to the root of the project. The project has a containment feature called model
@@ -146,9 +147,9 @@
demoProject.getModelElements().add(league);
// Then we create two players.
- Player player1 = BowlingFactory.eINSTANCE.createPlayer();
+ final Player player1 = BowlingFactory.eINSTANCE.createPlayer();
player1.setName("Maximilian");
- Player player2 = BowlingFactory.eINSTANCE.createPlayer();
+ final Player player2 = BowlingFactory.eINSTANCE.createPlayer();
player2.setName("Ottgar");
// Finally, we add the players to the league. Since the league is already part of the project and League.players
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.jdt.ui.prefs
index 0197a50..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,127 @@
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
eclipse.preferences.version=1
-formatter_profile=_emfstoreFormatter
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
index d866be3..4dcbdd1 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Example Merging client
Bundle-SymbolicName: org.eclipse.emf.emfstore.example.merging;singleton:=true
-Bundle-Version: 1.8.1.qualifier
-Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.1,2.0.0)",
+Bundle-Version: 1.9.0.qualifier
+Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.server;bundle-version="[1.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.8.1";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
+Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.9.0";uses:="org.eclipse.emf.emfstore.client,org.eclipse.equinox.app"
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java
index 86ee088..9abe5ab 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/examples/org.eclipse.emf.emfstore.example.merging/src/org/eclipse/emf/emfstore/example/merging/Application.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.example.merging;
@@ -51,7 +51,7 @@
try {
// Create a client representation for a local server and start a local server.
- ESServer localServer = ESServer.FACTORY.createAndStartLocalServer();
+ final ESServer localServer = ESServer.FACTORY.createAndStartLocalServer();
// Reuse the client from the hello world example. It will clean up all local and remote projects and create
// one project with some content on the server and two checked-out copies of the project on the client.
@@ -60,10 +60,10 @@
// We run our own client code to demonstrate merging now.
runClient(localServer);
- } catch (ESServerStartFailedException e) {
+ } catch (final ESServerStartFailedException e) {
System.out.println("Server start failed!");
e.printStackTrace();
- } catch (ESException e) {
+ } catch (final ESException e) {
// If there is a problem with the connection to the server
// e.g. a network, a specific EMFStoreException will be thrown
System.out.println("Connection to Server failed!");
@@ -75,15 +75,15 @@
public static void runClient(ESServer server) throws ESException {
System.out.println("Client starting...");
- ESWorkspace workspace = ESWorkspaceProvider.INSTANCE.getWorkspace();
- ESLocalProject demoProject = workspace.getLocalProjects().get(0);
- League league = (League) demoProject.getModelElements().get(0);
+ final ESWorkspace workspace = ESWorkspaceProvider.INSTANCE.getWorkspace();
+ final ESLocalProject demoProject = workspace.getLocalProjects().get(0);
+ final League league = (League) demoProject.getModelElements().get(0);
final ESLocalProject demoProjectCopy = workspace.getLocalProjects().get(1);
- League leagueCopy = (League) demoProjectCopy.getModelElements().get(0);
+ final League leagueCopy = (League) demoProjectCopy.getModelElements().get(0);
// Change the name of the league in project 1,add a new player and commit the change
league.setName("Euro-League");
- Player newPlayer = BowlingFactory.eINSTANCE.createPlayer();
+ final Player newPlayer = BowlingFactory.eINSTANCE.createPlayer();
newPlayer.setName("Eugene");
league.getPlayers().add(newPlayer);
@@ -96,7 +96,7 @@
try {
demoProjectCopy.commit(new ESSystemOutProgressMonitor());
- } catch (ESUpdateRequiredException e) {
+ } catch (final ESUpdateRequiredException e) {
// The commit failed since the other demoProject was committed first and therefore demoProjectCopy needs an
// update
System.out.println("\nCommit of demoProjectCopy failed.");
@@ -119,7 +119,7 @@
// One or more conflicts have occured, they are delivered in a change conflict set
// We know there is only one conflict so we grab it
- ESConflict conflict = changeConflictSet.getConflicts().iterator().next();
+ final ESConflict conflict = changeConflictSet.getConflicts().iterator().next();
// We resolve the conflict by accepting all of the conflicting local operations and rejecting all of
// the remote
diff --git a/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml b/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
index 12ae91d..24ac1e4 100644
--- a/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.installer/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.example.installer</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
index 5b6114b..55c001f 100644
--- a/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.merging/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Example Merging client
Bundle-SymbolicName: org.eclipse.emf.emfstore.example.merging;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Require-Bundle: org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.7.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.7.0,2.0.0)",
@@ -11,5 +11,5 @@
org.eclipse.emf.emfstore.server;bundle-version="[1.7.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.8.
- 1"
+Export-Package: org.eclipse.emf.emfstore.example.merging;version="1.9.
+ 0"
diff --git a/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml b/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
index b5c67d4..75f127e 100644
--- a/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.merging/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.example.merging</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
index ad410b5..0554791 100644
--- a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: Example SessionProvider
Bundle-SymbolicName: org.eclipse.emf.emfstore.example.sessionprovider;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: org.eclipse.emf.emfstore.exampleclient.Activator
-Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Export-Package: org.eclipse.emf.emfstore.exampleclient;version="1.8.1";x-internal:=true
+Export-Package: org.eclipse.emf.emfstore.exampleclient;version="1.9.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
index fa83620..9d57c61 100644
--- a/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.example.sessionprovider/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.example.sessionprovider</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
index 03ddcf6..24287fa 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Bowling Example Model Edit
Bundle-SymbolicName: org.eclipse.emf.emfstore.examplemodel.edit;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.emfstore.bowling.provider.BowlingEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.bowling.provider;version="1.8
- .1"
+Export-Package: org.eclipse.emf.emfstore.bowling.provider;version="1.9
+ .0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/icons/full/ctool16/CreateFan_fanMerchandise_Merchandise.gif b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/icons/full/ctool16/CreateFan_fanMerchandise_Merchandise.gif
new file mode 100644
index 0000000..d7724b6
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/icons/full/ctool16/CreateFan_fanMerchandise_Merchandise.gif
Binary files differ
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
index fe2bc00..9f809e9 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.examplemodel.edit</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java
index 43551f5..9f97438 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java
@@ -21,7 +21,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -37,7 +36,7 @@
* @generated
*/
public class AreaItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -155,15 +154,11 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.AREA__AREAS,
- BowlingFactory.eINSTANCE.createArea()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.AREA__AREAS,
+ BowlingFactory.eINSTANCE.createArea()));
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.AREA__TOURNAMENTS,
- BowlingFactory.eINSTANCE.createTournament()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.AREA__TOURNAMENTS,
+ BowlingFactory.eINSTANCE.createTournament()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java
index 5249a24..5fce574 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java
@@ -48,7 +48,7 @@
*/
public BowlingEditPlugin() {
super(new ResourceLocator[] {
- });
+ });
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java
index 59c3c5a..76516a4 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java
@@ -22,7 +22,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -41,7 +40,7 @@
public class FanItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
@@ -87,9 +86,8 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_name_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -110,9 +108,8 @@
* @generated
*/
protected void addDateOfBirthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_dateOfBirth_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_dateOfBirth_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -133,9 +130,8 @@
* @generated
*/
protected void addHasSeasonTicketPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_hasSeasonTicket_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_hasSeasonTicket_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -156,9 +152,8 @@
* @generated
*/
protected void addEMailsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_eMails_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_eMails_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -179,9 +174,8 @@
* @generated
*/
protected void addGenderPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_gender_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_gender_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -202,9 +196,8 @@
* @generated
*/
protected void addFavouritePlayerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_favouritePlayer_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_favouritePlayer_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -225,9 +218,8 @@
* @generated
*/
protected void addVisitedTournamentsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_visitedTournaments_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_visitedTournaments_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -249,13 +241,11 @@
*/
protected void addNumberOfTournamentsVisitedPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_numberOfTournamentsVisited_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Fan_numberOfTournamentsVisited_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Fan_numberOfTournamentsVisited_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Fan_type"), //$NON-NLS-1$
BowlingPackage.Literals.FAN__NUMBER_OF_TOURNAMENTS_VISITED,
true,
false,
@@ -273,9 +263,8 @@
* @generated
*/
protected void addMoneySpentOnTicketsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Fan_moneySpentOnTickets_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Fan_moneySpentOnTickets_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -343,8 +332,7 @@
@Override
public String getText(Object object) {
final String label = ((Fan) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_Fan_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_Fan_type") : //$NON-NLS-1$
getString("_UI_Fan_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -390,15 +378,11 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.FAN__FAN_MERCHANDISE,
- BowlingFactory.eINSTANCE.createMerchandise()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.FAN__FAN_MERCHANDISE,
+ BowlingFactory.eINSTANCE.createMerchandise()));
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE,
- BowlingFactory.eINSTANCE.createMerchandise()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE,
+ BowlingFactory.eINSTANCE.createMerchandise()));
}
/**
@@ -413,9 +397,8 @@
final Object childFeature = feature;
final Object childObject = child;
- final boolean qualify =
- childFeature == BowlingPackage.Literals.FAN__FAN_MERCHANDISE ||
- childFeature == BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE;
+ final boolean qualify = childFeature == BowlingPackage.Literals.FAN__FAN_MERCHANDISE ||
+ childFeature == BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE;
if (qualify) {
return getString("_UI_CreateChild_text2", //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java
index aab31f3..ef3018c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java
@@ -21,7 +21,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -37,7 +36,7 @@
* @generated
*/
public class GameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -76,9 +75,8 @@
* @generated
*/
protected void addMatchupPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Game_matchup_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Game_matchup_feature", "_UI_Game_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -99,9 +97,8 @@
* @generated
*/
protected void addPlayerPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Game_player_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Game_player_feature", "_UI_Game_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -122,9 +119,8 @@
* @generated
*/
protected void addFramesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Game_frames_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Game_frames_feature", "_UI_Game_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java
index 0ecd093..53a80a0 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java
@@ -22,7 +22,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -39,7 +38,7 @@
* @generated
*/
public class LeagueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -77,9 +76,8 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_League_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_League_name_feature", "_UI_League_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -100,9 +98,8 @@
* @generated
*/
protected void addPlayersPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_League_players_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_League_players_feature", "_UI_League_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -169,8 +166,7 @@
@Override
public String getText(Object object) {
final String label = ((League) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_League_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_League_type") : //$NON-NLS-1$
getString("_UI_League_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -209,10 +205,8 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.LEAGUE__PLAYERS,
- BowlingFactory.eINSTANCE.createPlayer()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.LEAGUE__PLAYERS,
+ BowlingFactory.eINSTANCE.createPlayer()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java
index 2e85ab0..5c6ff47 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java
@@ -23,7 +23,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -40,7 +39,7 @@
* @generated
*/
public class MatchupItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -78,9 +77,8 @@
* @generated
*/
protected void addGamesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Matchup_games_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Matchup_games_feature", "_UI_Matchup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -102,9 +100,7 @@
*/
protected void addNrSpectatorsPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Matchup_nrSpectators_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Matchup_nrSpectators_feature", "_UI_Matchup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -172,8 +168,7 @@
public String getText(Object object) {
final BigInteger labelValue = ((Matchup) object).getNrSpectators();
final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_Matchup_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_Matchup_type") : //$NON-NLS-1$
getString("_UI_Matchup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -212,10 +207,8 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.MATCHUP__GAMES,
- BowlingFactory.eINSTANCE.createGame()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.MATCHUP__GAMES,
+ BowlingFactory.eINSTANCE.createGame()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java
index dc1cdc9..8317979 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java
@@ -21,7 +21,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -39,7 +38,7 @@
public class MerchandiseItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
@@ -80,9 +79,7 @@
*/
protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Merchandise_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_name_feature", "_UI_Merchandise_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -104,12 +101,11 @@
*/
protected void addPricePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Merchandise_price_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_price_feature", "_UI_Merchandise_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_price_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Merchandise_type"), //$NON-NLS-1$
BowlingPackage.Literals.MERCHANDISE__PRICE,
true,
false,
@@ -128,13 +124,11 @@
*/
protected void addSerialNumberPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Merchandise_serialNumber_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Merchandise_serialNumber_feature", "_UI_Merchandise_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_serialNumber_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Merchandise_type"), //$NON-NLS-1$
BowlingPackage.Literals.MERCHANDISE__SERIAL_NUMBER,
true,
false,
@@ -166,8 +160,7 @@
@Override
public String getText(Object object) {
final String label = ((Merchandise) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_Merchandise_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_Merchandise_type") : //$NON-NLS-1$
getString("_UI_Merchandise_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java
index 484160e..1d385e1 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java
@@ -21,7 +21,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -37,7 +36,7 @@
* @generated
*/
public class PlayerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -82,9 +81,8 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_name_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -105,9 +103,8 @@
* @generated
*/
protected void addDateOfBirthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_dateOfBirth_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_dateOfBirth_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -128,9 +125,8 @@
* @generated
*/
protected void addHeightPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_height_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_height_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -152,9 +148,7 @@
*/
protected void addIsProfessionalPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_isProfessional_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_isProfessional_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -175,9 +169,8 @@
* @generated
*/
protected void addEMailsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_eMails_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_eMails_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -198,13 +191,12 @@
* @generated
*/
protected void addNumberOfVictoriesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_numberOfVictories_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Player_numberOfVictories_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Player_numberOfVictories_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Player_type"), //$NON-NLS-1$
BowlingPackage.Literals.PLAYER__NUMBER_OF_VICTORIES,
true,
false,
@@ -223,13 +215,11 @@
*/
protected void addPlayedTournamentTypesPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_playedTournamentTypes_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Player_playedTournamentTypes_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Player_playedTournamentTypes_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Player_type"), //$NON-NLS-1$
BowlingPackage.Literals.PLAYER__PLAYED_TOURNAMENT_TYPES,
true,
false,
@@ -247,9 +237,8 @@
* @generated
*/
protected void addWinLossRatioPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_winLossRatio_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_winLossRatio_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -270,9 +259,8 @@
* @generated
*/
protected void addGenderPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Player_gender_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Player_gender_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -307,8 +295,7 @@
@Override
public String getText(Object object) {
final String label = ((Player) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_Player_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_Player_type") : //$NON-NLS-1$
getString("_UI_Player_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java
index 75114bf..4ef7d13 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java
@@ -22,7 +22,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -37,7 +36,7 @@
* @generated
*/
public class PlayerToPointsMapItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -76,13 +75,11 @@
*/
protected void addKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PlayerToPointsMap_key_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_key_feature", "_UI_PlayerToPointsMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_PlayerToPointsMap_type"), //$NON-NLS-1$
BowlingPackage.Literals.PLAYER_TO_POINTS_MAP__KEY,
true,
false,
@@ -101,13 +98,11 @@
*/
protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_PlayerToPointsMap_value_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_value_feature", "_UI_PlayerToPointsMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_PlayerToPointsMap_type"), //$NON-NLS-1$
BowlingPackage.Literals.PLAYER_TO_POINTS_MAP__VALUE,
true,
false,
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java
index 5adb322..f9325f1 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java
@@ -23,7 +23,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -39,7 +38,7 @@
* @generated
*/
public class RefereeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -77,9 +76,8 @@
* @generated
*/
protected void addDateOfBirthPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Referee_dateOfBirth_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Referee_dateOfBirth_feature", "_UI_Referee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -100,9 +98,8 @@
* @generated
*/
protected void addLeaguePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Referee_league_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Referee_league_feature", "_UI_Referee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -138,8 +135,7 @@
public String getText(Object object) {
final XMLGregorianCalendar labelValue = ((Referee) object).getDateOfBirth();
final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_Referee_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_Referee_type") : //$NON-NLS-1$
getString("_UI_Referee_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java
index 1b308b0..53b9f1c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java
@@ -23,7 +23,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -38,7 +37,7 @@
* @generated
*/
public class RefereeToGamesMapItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -76,13 +75,11 @@
*/
protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_RefereeToGamesMap_value_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_RefereeToGamesMap_value_feature", "_UI_RefereeToGamesMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_RefereeToGamesMap_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_RefereeToGamesMap_type"), //$NON-NLS-1$
BowlingPackage.Literals.REFEREE_TO_GAMES_MAP__VALUE,
true,
false,
@@ -181,10 +178,8 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.REFEREE_TO_GAMES_MAP__KEY,
- BowlingFactory.eINSTANCE.createReferee()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP__KEY,
+ BowlingFactory.eINSTANCE.createReferee()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java
index dad9210..932685d 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java
@@ -22,7 +22,6 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -40,7 +39,7 @@
* @generated
*/
public class TournamentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+ ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -82,13 +81,12 @@
* @generated
*/
protected void addMatchupsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Tournament_matchups_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Tournament_matchups_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Tournament_matchups_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Tournament_type"), //$NON-NLS-1$
BowlingPackage.Literals.TOURNAMENT__MATCHUPS,
true,
false,
@@ -106,9 +104,8 @@
* @generated
*/
protected void addTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Tournament_type_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_Tournament_type_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -130,12 +127,11 @@
*/
protected void addPlayersPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Tournament_players_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Tournament_players_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Tournament_players_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Tournament_type"), //$NON-NLS-1$
BowlingPackage.Literals.TOURNAMENT__PLAYERS,
true,
false,
@@ -153,13 +149,12 @@
* @generated
*/
protected void addPriceMoneyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Tournament_priceMoney_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Tournament_priceMoney_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Tournament_priceMoney_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Tournament_type"), //$NON-NLS-1$
BowlingPackage.Literals.TOURNAMENT__PRICE_MONEY,
true,
false,
@@ -178,13 +173,11 @@
*/
protected void addReceivesTrophyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Tournament_receivesTrophy_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Tournament_receivesTrophy_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Tournament_receivesTrophy_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Tournament_type"), //$NON-NLS-1$
BowlingPackage.Literals.TOURNAMENT__RECEIVES_TROPHY,
true,
false,
@@ -202,13 +195,12 @@
* @generated
*/
protected void addMatchDaysPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_Tournament_matchDays_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Tournament_matchDays_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_Tournament_matchDays_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Tournament_type"), //$NON-NLS-1$
BowlingPackage.Literals.TOURNAMENT__MATCH_DAYS,
true,
false,
@@ -275,8 +267,7 @@
public String getText(Object object) {
final TournamentType labelValue = ((Tournament) object).getType();
final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_Tournament_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_Tournament_type") : //$NON-NLS-1$
getString("_UI_Tournament_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -320,20 +311,14 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.TOURNAMENT__MATCHUPS,
- BowlingFactory.eINSTANCE.createMatchup()));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.TOURNAMENT__MATCHUPS,
+ BowlingFactory.eINSTANCE.createMatchup()));
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.TOURNAMENT__PLAYER_POINTS,
- BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.PLAYER_TO_POINTS_MAP)));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.TOURNAMENT__PLAYER_POINTS,
+ BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.PLAYER_TO_POINTS_MAP)));
- newChildDescriptors.add
- (createChildParameter
- (BowlingPackage.Literals.TOURNAMENT__REFEREES,
- BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP)));
+ newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.TOURNAMENT__REFEREES,
+ BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP)));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
index 78f80fa..55e168c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.emfstore.examplemodel;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.bowling;version="1.8.1",org.e
- clipse.emf.emfstore.bowling.impl;version="1.8.1",org.eclipse.emf.emfs
- tore.bowling.util;version="1.8.1"
+Export-Package: org.eclipse.emf.emfstore.bowling;version="1.9.0",org.e
+ clipse.emf.emfstore.bowling.impl;version="1.9.0",org.eclipse.emf.emfs
+ tore.bowling.util;version="1.9.0"
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml b/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
index 89580c9..cacf397 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.examplemodel</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java
index 2cb454f..21ed02c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java
@@ -20,11 +20,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Area#getAreas <em>Areas</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Area#getTournaments <em>Tournaments</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getArea()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java
index ae5a3c5..ebd3fd5 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java
@@ -1141,8 +1141,8 @@
EReference getGame_Matchup();
/**
- * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer
- * <em>Player</em>}'.
+ * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer <em>Player</em>
+ * }'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1289,8 +1289,8 @@
EClass getArea();
/**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.bowling.Area#getAreas <em>Areas</em>}'.
+ * Returns the meta object for the containment reference list '{@link org.eclipse.emf.emfstore.bowling.Area#getAreas
+ * <em>Areas</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1403,8 +1403,8 @@
EReference getFan_FavouritePlayer();
/**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.bowling.Fan#getVisitedTournaments <em>Visited Tournaments</em>}'.
+ * Returns the meta object for the reference list '{@link org.eclipse.emf.emfstore.bowling.Fan#getVisitedTournaments
+ * <em>Visited Tournaments</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1519,8 +1519,8 @@
EAttribute getMerchandise_SerialNumber();
/**
- * Returns the meta object for enum '{@link org.eclipse.emf.emfstore.bowling.TournamentType
- * <em>Tournament Type</em>}'.
+ * Returns the meta object for enum '{@link org.eclipse.emf.emfstore.bowling.TournamentType <em>Tournament Type</em>
+ * }'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java
index 10b0ca4..8ace844 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java
@@ -22,6 +22,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Fan#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Fan#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -36,7 +37,6 @@
* </li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Fan#getMoneySpentOnTickets <em>Money Spent On Tickets</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getFan()
* @model
@@ -194,8 +194,8 @@
void setHasSeasonTicket(boolean value);
/**
- * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#isHasSeasonTicket
- * <em>Has Season Ticket</em>}' attribute.
+ * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#isHasSeasonTicket <em>Has Season Ticket</em>
+ * }' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -358,8 +358,8 @@
void setFavouritePlayer(Player value);
/**
- * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getFavouritePlayer
- * <em>Favourite Player</em>}' reference.
+ * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getFavouritePlayer <em>Favourite Player</em>
+ * }' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java
index 89bb95c..9ec5a67 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java
@@ -20,12 +20,12 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Game#getMatchup <em>Matchup</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer <em>Player</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Game#getFrames <em>Frames</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getGame()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java
index a04236e..902642a 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java
@@ -88,11 +88,10 @@
*
* @generated
*/
- private static final Gender[] VALUES_ARRAY =
- new Gender[] {
- FEMALE,
- MALE,
- };
+ private static final Gender[] VALUES_ARRAY = new Gender[] {
+ FEMALE,
+ MALE,
+ };
/**
* A public read-only list of all the '<em><b>Gender</b></em>' enumerators.
@@ -108,6 +107,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static Gender get(String literal) {
@@ -125,6 +126,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static Gender getByName(String name) {
@@ -142,6 +145,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static Gender get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java
index bfb7dcb..8c95569 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java
@@ -20,11 +20,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.League#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.League#getPlayers <em>Players</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getLeague()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java
index ed327c5..ecc84b6 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java
@@ -22,11 +22,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Matchup#getGames <em>Games</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Matchup#getNrSpectators <em>Nr Spectators</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMatchup()
* @model
@@ -36,8 +36,8 @@
/**
* Returns the value of the '<em><b>Games</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.emf.emfstore.bowling.Game}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.bowling.Game#getMatchup
- * <em>Matchup</em>}'.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.bowling.Game#getMatchup <em>Matchup</em>
+ * }'.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>Games</em>' containment reference list isn't clear, there really should be more of a
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java
index 132a63f..5ef5f79 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java
@@ -22,12 +22,12 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Merchandise#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Merchandise#getPrice <em>Price</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber <em>Serial Number</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMerchandise()
* @model
@@ -139,8 +139,8 @@
BigInteger getSerialNumber();
/**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber
- * <em>Serial Number</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber <em>Serial Number</em>
+ * }' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java
index 03b9759..3e385c5 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java
@@ -25,6 +25,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Player#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Player#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -36,7 +37,6 @@
* <li>{@link org.eclipse.emf.emfstore.bowling.Player#getWinLossRatio <em>Win Loss Ratio</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Player#getGender <em>Gender</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java
index 3f4e9b0..38c2b00 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java
@@ -21,11 +21,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Referee#getDateOfBirth <em>Date Of Birth</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Referee#getLeague <em>League</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getReferee()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java
index b18a4fa..037360a 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java
@@ -23,6 +23,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getMatchups <em>Matchups</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getType <em>Type</em>}</li>
@@ -33,7 +34,6 @@
* <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getReceivesTrophy <em>Receives Trophy</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getMatchDays <em>Match Days</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament()
* @model
@@ -101,7 +101,8 @@
* @return the value of the '<em>Player Points</em>' map.
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_PlayerPoints()
* @model mapType=
- * "org.eclipse.emf.emfstore.bowling.PlayerToPointsMap<org.eclipse.emf.emfstore.bowling.Player, org.eclipse.emf.ecore.EIntegerObject>"
+ * "org.eclipse.emf.emfstore.bowling.PlayerToPointsMap<org.eclipse.emf.emfstore.bowling.Player,
+ * org.eclipse.emf.ecore.EIntegerObject>"
* @generated
*/
EMap<Player, Integer> getPlayerPoints();
@@ -136,7 +137,8 @@
* @return the value of the '<em>Referees</em>' map.
* @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_Referees()
* @model mapType=
- * "org.eclipse.emf.emfstore.bowling.RefereeToGamesMap<org.eclipse.emf.emfstore.bowling.Referee, org.eclipse.emf.emfstore.bowling.Game>"
+ * "org.eclipse.emf.emfstore.bowling.RefereeToGamesMap<org.eclipse.emf.emfstore.bowling.Referee,
+ * org.eclipse.emf.emfstore.bowling.Game>"
* @generated
*/
EMap<Referee, Game> getReferees();
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java
index da75708..7284927 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java
@@ -107,6 +107,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static TournamentType get(String literal) {
@@ -124,6 +126,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static TournamentType getByName(String name) {
@@ -141,6 +145,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static TournamentType get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java
index b158c19..5361d65 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java
@@ -29,11 +29,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.AreaImpl#getAreas <em>Areas</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.AreaImpl#getTournaments <em>Tournaments</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java
index 48830d5..dbf96cd 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java
@@ -280,8 +280,7 @@
*/
public TournamentType createTournamentTypeFromString(EDataType eDataType, String initialValue) {
final TournamentType result = TournamentType.get(initialValue);
- if (result == null)
- {
+ if (result == null) {
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
@@ -306,8 +305,7 @@
*/
public Gender createGenderFromString(EDataType eDataType, String initialValue) {
final Gender result = Gender.get(initialValue);
- if (result == null)
- {
+ if (result == null) {
throw new IllegalArgumentException(
"The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java
index f5752db..cfa550f 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java
@@ -189,8 +189,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link BowlingPackage#eINSTANCE} when that field is accessed. Clients should
- * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+ * This method is used to initialize {@link BowlingPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -204,9 +205,9 @@
}
// Obtain or create and register package
- final BowlingPackageImpl theBowlingPackage = (BowlingPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BowlingPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new BowlingPackageImpl());
+ final BowlingPackageImpl theBowlingPackage = (BowlingPackageImpl) (EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof BowlingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new BowlingPackageImpl());
isInited = true;
@@ -217,13 +218,12 @@
theBowlingPackage.initializePackageContents();
// Register package validator
- EValidator.Registry.INSTANCE.put
- (theBowlingPackage,
- new EValidator.Descriptor() {
- public EValidator getEValidator() {
- return BowlingValidator.INSTANCE;
- }
- });
+ EValidator.Registry.INSTANCE.put(theBowlingPackage,
+ new EValidator.Descriptor() {
+ public EValidator getEValidator() {
+ return BowlingValidator.INSTANCE;
+ }
+ });
// Mark meta-data to indicate it can't be changed
theBowlingPackage.freeze();
@@ -977,45 +977,31 @@
// Initialize classes and features; add operations and parameters
initEClass(playerEClass, Player.class, "Player", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getPlayer_Name(),
- ecorePackage.getEString(),
- "name", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_DateOfBirth(),
- ecorePackage.getEDate(),
- "dateOfBirth", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_Height(),
- ecorePackage.getEDouble(),
- "height", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_IsProfessional(),
- ecorePackage.getEBoolean(),
- "isProfessional", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_EMails(),
- ecorePackage.getEString(),
- "eMails", null, 1, -1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_NumberOfVictories(),
- ecorePackage.getEInt(),
- "numberOfVictories", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_PlayedTournamentTypes(),
- getTournamentType(),
- "playedTournamentTypes", null, 0, -1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_WinLossRatio(),
- ecorePackage.getEBigDecimal(),
- "winLossRatio", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayer_Gender(),
- getGender(),
- "gender", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getPlayer_Name(), ecorePackage.getEString(), "name", null, 0, 1, Player.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPlayer_DateOfBirth(), ecorePackage.getEDate(), "dateOfBirth", null, 0, 1, Player.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPlayer_Height(), ecorePackage.getEDouble(), "height", null, 0, 1, Player.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPlayer_IsProfessional(), ecorePackage.getEBoolean(), "isProfessional", null, 0, 1, //$NON-NLS-1$
+ Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEAttribute(getPlayer_EMails(), ecorePackage.getEString(), "eMails", null, 1, -1, Player.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPlayer_NumberOfVictories(), ecorePackage.getEInt(), "numberOfVictories", null, 0, 1, //$NON-NLS-1$
+ Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEAttribute(getPlayer_PlayedTournamentTypes(), getTournamentType(), "playedTournamentTypes", null, 0, //$NON-NLS-1$
+ -1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPlayer_WinLossRatio(), ecorePackage.getEBigDecimal(), "winLossRatio", null, 0, 1, //$NON-NLS-1$
+ Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEAttribute(getPlayer_Gender(), getGender(), "gender", null, 0, 1, Player.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- final EOperation op = addEOperation(playerEClass, ecorePackage.getEBoolean(),
- "validate", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+ final EOperation op = addEOperation(playerEClass, ecorePackage.getEBoolean(), "validate", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+ IS_ORDERED);
addEParameter(op, ecorePackage.getEDiagnosticChain(), "chain", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
final EGenericType g1 = createEGenericType(ecorePackage.getEMap());
EGenericType g2 = createEGenericType();
@@ -1025,194 +1011,127 @@
addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
initEClass(leagueEClass, League.class, "League", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getLeague_Name(),
- ecorePackage.getEString(),
- "name", null, 0, 1, League.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getLeague_Players(),
- getPlayer(),
- null,
- "players", null, 0, -1, League.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getLeague_Name(), ecorePackage.getEString(), "name", null, 0, 1, League.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getLeague_Players(), getPlayer(), null, "players", null, 0, -1, League.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
- initEClass(tournamentEClass, Tournament.class,
- "Tournament", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getTournament_Matchups(),
- getMatchup(),
- null,
- "matchups", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTournament_Type(),
- getTournamentType(),
- "type", null, 0, 1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTournament_PlayerPoints(),
- getPlayerToPointsMap(),
- null,
- "playerPoints", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTournament_Players(),
- getPlayer(),
- null,
- "players", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTournament_Referees(),
- getRefereeToGamesMap(),
- null,
- "referees", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTournament_PriceMoney(),
- ecorePackage.getEDouble(),
- "priceMoney", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTournament_ReceivesTrophy(),
- ecorePackage.getEBoolean(),
- "receivesTrophy", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTournament_MatchDays(),
- ecorePackage.getEDate(),
- "matchDays", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(tournamentEClass, Tournament.class, "Tournament", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getTournament_Matchups(), getMatchup(), null, "matchups", null, 0, -1, Tournament.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTournament_Type(), getTournamentType(), "type", null, 0, 1, Tournament.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTournament_PlayerPoints(), getPlayerToPointsMap(), null, "playerPoints", null, 0, -1, //$NON-NLS-1$
+ Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTournament_Players(), getPlayer(), null, "players", null, 0, -1, Tournament.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getTournament_Referees(), getRefereeToGamesMap(), null, "referees", null, 0, -1, //$NON-NLS-1$
+ Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTournament_PriceMoney(), ecorePackage.getEDouble(), "priceMoney", null, 0, -1, //$NON-NLS-1$
+ Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTournament_ReceivesTrophy(), ecorePackage.getEBoolean(), "receivesTrophy", null, 0, -1, //$NON-NLS-1$
+ Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTournament_MatchDays(), ecorePackage.getEDate(), "matchDays", null, 0, -1, Tournament.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(matchupEClass, Matchup.class, "Matchup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getMatchup_Games(),
- getGame(),
- getGame_Matchup(),
- "games", null, 2, 2, Matchup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getMatchup_NrSpectators(),
- ecorePackage.getEBigInteger(),
- "nrSpectators", null, 0, 1, Matchup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getMatchup_Games(), getGame(), getGame_Matchup(), "games", null, 2, 2, Matchup.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMatchup_NrSpectators(), ecorePackage.getEBigInteger(), "nrSpectators", null, 0, 1, //$NON-NLS-1$
+ Matchup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
initEClass(gameEClass, Game.class, "Game", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getGame_Matchup(),
- getMatchup(),
- getMatchup_Games(),
- "matchup", null, 1, 1, Game.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getGame_Player(),
- getPlayer(),
- null,
- "player", null, 0, 1, Game.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getGame_Frames(),
- ecorePackage.getEInt(),
- "frames", null, 0, 10, Game.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getGame_Matchup(), getMatchup(), getMatchup_Games(), "matchup", null, 1, 1, Game.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getGame_Player(), getPlayer(), null, "player", null, 0, 1, Game.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEAttribute(getGame_Frames(), ecorePackage.getEInt(), "frames", null, 0, 10, Game.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(playerToPointsMapEClass, Map.Entry.class,
- "PlayerToPointsMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getPlayerToPointsMap_Key(),
- getPlayer(),
- null,
- "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getPlayerToPointsMap_Value(),
- ecorePackage.getEIntegerObject(),
- "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(playerToPointsMapEClass, Map.Entry.class, "PlayerToPointsMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ !IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getPlayerToPointsMap_Key(), getPlayer(), null, "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getPlayerToPointsMap_Value(), ecorePackage.getEIntegerObject(), "value", null, 0, 1, //$NON-NLS-1$
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
initEClass(refereeEClass, Referee.class, "Referee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getReferee_DateOfBirth(),
- getXMLDate(),
- "dateOfBirth", null, 0, 1, Referee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getReferee_League(),
- getLeague(),
- null,
- "league", null, 0, 1, Referee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getReferee_DateOfBirth(), getXMLDate(), "dateOfBirth", null, 0, 1, Referee.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getReferee_League(), getLeague(), null, "league", null, 0, 1, Referee.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
- initEClass(refereeToGamesMapEClass, Map.Entry.class,
- "RefereeToGamesMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getRefereeToGamesMap_Key(),
- getReferee(),
- null,
- "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getRefereeToGamesMap_Value(),
- getGame(),
- null,
- "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(refereeToGamesMapEClass, Map.Entry.class, "RefereeToGamesMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ !IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getRefereeToGamesMap_Key(), getReferee(), null, "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getRefereeToGamesMap_Value(), getGame(), null, "value", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEClass(areaEClass, Area.class, "Area", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getArea_Areas(),
- getArea(),
- null,
- "areas", null, 0, -1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getArea_Tournaments(),
- getTournament(),
- null,
- "tournaments", null, 0, -1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getArea_Areas(), getArea(), null, "areas", null, 0, -1, Area.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getArea_Tournaments(), getTournament(), null, "tournaments", null, 0, -1, Area.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEClass(fanEClass, Fan.class, "Fan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getFan_Name(),
- ecorePackage.getEString(),
- "name", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getFan_DateOfBirth(),
- ecorePackage.getEDate(),
- "dateOfBirth", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getFan_HasSeasonTicket(),
- ecorePackage.getEBoolean(),
- "hasSeasonTicket", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getFan_EMails(),
- ecorePackage.getEString(),
- "eMails", null, 0, -1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getFan_Gender(),
- getGender(),
- "gender", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getFan_FavouritePlayer(),
- getPlayer(),
- null,
- "favouritePlayer", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getFan_FanMerchandise(),
- getMerchandise(),
- null,
- "fanMerchandise", null, 0, -1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getFan_FavouriteMerchandise(),
- getMerchandise(),
- null,
- "favouriteMerchandise", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getFan_VisitedTournaments(),
- getTournament(),
- null,
- "visitedTournaments", null, 0, -1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getFan_NumberOfTournamentsVisited(),
- ecorePackage.getEInt(),
- "numberOfTournamentsVisited", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getFan_MoneySpentOnTickets(),
- ecorePackage.getEDouble(),
- "moneySpentOnTickets", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getFan_Name(), ecorePackage.getEString(), "name", null, 0, 1, Fan.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFan_DateOfBirth(), ecorePackage.getEDate(), "dateOfBirth", null, 0, 1, Fan.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFan_HasSeasonTicket(), ecorePackage.getEBoolean(), "hasSeasonTicket", null, 0, 1, Fan.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFan_EMails(), ecorePackage.getEString(), "eMails", null, 0, -1, Fan.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFan_Gender(), getGender(), "gender", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getFan_FavouritePlayer(), getPlayer(), null, "favouritePlayer", null, 0, 1, Fan.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getFan_FanMerchandise(), getMerchandise(), null, "fanMerchandise", null, 0, -1, Fan.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getFan_FavouriteMerchandise(), getMerchandise(), null, "favouriteMerchandise", null, 0, 1, //$NON-NLS-1$
+ Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getFan_VisitedTournaments(), getTournament(), null, "visitedTournaments", null, 0, -1, //$NON-NLS-1$
+ Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getFan_NumberOfTournamentsVisited(), ecorePackage.getEInt(), "numberOfTournamentsVisited", null, //$NON-NLS-1$
+ 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEAttribute(getFan_MoneySpentOnTickets(), ecorePackage.getEDouble(), "moneySpentOnTickets", null, 0, 1, //$NON-NLS-1$
+ Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
- initEClass(merchandiseEClass, Merchandise.class,
- "Merchandise", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getMerchandise_Name(),
- ecorePackage.getEString(),
- "name", null, 0, 1, Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getMerchandise_Price(),
- ecorePackage.getEBigDecimal(),
- "price", null, 0, 1, Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getMerchandise_SerialNumber(),
- ecorePackage.getEBigInteger(),
- "serialNumber", null, 0, 1, Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(merchandiseEClass, Merchandise.class, "Merchandise", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getMerchandise_Name(), ecorePackage.getEString(), "name", null, 0, 1, Merchandise.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMerchandise_Price(), ecorePackage.getEBigDecimal(), "price", null, 0, 1, Merchandise.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMerchandise_SerialNumber(), ecorePackage.getEBigInteger(), "serialNumber", null, 0, 1, //$NON-NLS-1$
+ Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(tournamentTypeEEnum, TournamentType.class, "TournamentType"); //$NON-NLS-1$
@@ -1224,8 +1143,8 @@
addEEnumLiteral(genderEEnum, Gender.MALE);
// Initialize data types
- initEDataType(xmlDateEDataType, XMLGregorianCalendar.class,
- "XMLDate", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEDataType(xmlDateEDataType, XMLGregorianCalendar.class, "XMLDate", IS_SERIALIZABLE, //$NON-NLS-1$
+ !IS_GENERATED_INSTANCE_CLASS);
// Create resource
createResource(eNS_URI);
@@ -1241,13 +1160,13 @@
* <!-- end-user-doc -->
*
* @generated
- * @since 1.5
*/
protected void createExtendedMetaDataAnnotations() {
final String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
addAnnotation(xmlDateEDataType,
source,
- new String[] { "baseType", "http://www.eclipse.org/emf/2003/XMLType#date" //$NON-NLS-1$ //$NON-NLS-2$
+ new String[] {
+ "baseType", "http://www.eclipse.org/emf/2003/XMLType#date" //$NON-NLS-1$ //$NON-NLS-2$
});
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java
index 67e41e0..6f3d65e 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java
@@ -37,6 +37,7 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -47,11 +48,10 @@
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getFanMerchandise <em>Fan Merchandise</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getFavouriteMerchandise <em>Favourite Merchandise</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getVisitedTournaments <em>Visited Tournaments</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getNumberOfTournamentsVisited <em>Number Of Tournaments
- * Visited</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getNumberOfTournamentsVisited
+ * <em>Number Of Tournaments Visited</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getMoneySpentOnTickets <em>Money Spent On Tickets</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -369,7 +369,8 @@
final boolean oldNameESet = nameESet;
nameESet = true;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__NAME, oldName, name, !oldNameESet));
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__NAME, oldName, name, !oldNameESet));
}
}
@@ -864,18 +865,18 @@
favouriteMerchandise = (Merchandise) eResolveProxy(oldFavouriteMerchandise);
if (favouriteMerchandise != oldFavouriteMerchandise) {
final InternalEObject newFavouriteMerchandise = (InternalEObject) favouriteMerchandise;
- NotificationChain msgs = oldFavouriteMerchandise.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, null);
+ NotificationChain msgs = oldFavouriteMerchandise.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, null);
if (newFavouriteMerchandise.eInternalContainer() == null) {
- msgs = newFavouriteMerchandise.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+ msgs = newFavouriteMerchandise.eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
}
if (msgs != null) {
msgs.dispatch();
}
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- BowlingPackage.FAN__FAVOURITE_MERCHANDISE, oldFavouriteMerchandise, favouriteMerchandise));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.FAN__FAVOURITE_MERCHANDISE,
+ oldFavouriteMerchandise, favouriteMerchandise));
}
}
}
@@ -926,19 +927,18 @@
if (newFavouriteMerchandise != favouriteMerchandise) {
NotificationChain msgs = null;
if (favouriteMerchandise != null) {
- msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+ msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
}
if (newFavouriteMerchandise != null) {
- msgs = ((InternalEObject) newFavouriteMerchandise).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+ msgs = ((InternalEObject) newFavouriteMerchandise).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
}
msgs = basicSetFavouriteMerchandise(newFavouriteMerchandise, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else {
+ } else {
final boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
favouriteMerchandiseESet = true;
if (eNotificationRequired()) {
@@ -980,19 +980,18 @@
public void unsetFavouriteMerchandise() {
if (favouriteMerchandise != null) {
NotificationChain msgs = null;
- msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+ msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
msgs = basicUnsetFavouriteMerchandise(msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else {
+ } else {
final boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
favouriteMerchandiseESet = false;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__FAVOURITE_MERCHANDISE,
- null, null, oldFavouriteMerchandiseESet));
+ eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null,
+ null, oldFavouriteMerchandiseESet));
}
}
}
@@ -1212,22 +1211,19 @@
result.append(" (name: "); //$NON-NLS-1$
if (nameESet) {
result.append(name);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(", dateOfBirth: "); //$NON-NLS-1$
if (dateOfBirthESet) {
result.append(dateOfBirth);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(", hasSeasonTicket: "); //$NON-NLS-1$
if (hasSeasonTicketESet) {
result.append(hasSeasonTicket);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(", eMails: "); //$NON-NLS-1$
@@ -1235,22 +1231,19 @@
result.append(", gender: "); //$NON-NLS-1$
if (genderESet) {
result.append(gender);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(", numberOfTournamentsVisited: "); //$NON-NLS-1$
if (numberOfTournamentsVisitedESet) {
result.append(numberOfTournamentsVisited);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(", moneySpentOnTickets: "); //$NON-NLS-1$
if (moneySpentOnTicketsESet) {
result.append(moneySpentOnTickets);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java
index c611002..22b3439 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java
@@ -32,12 +32,12 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl#getMatchup <em>Matchup</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl#getPlayer <em>Player</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl#getFrames <em>Frames</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -131,8 +131,7 @@
public void setMatchup(Matchup newMatchup) {
if (newMatchup != eInternalContainer()
|| eContainerFeatureID() != BowlingPackage.GAME__MATCHUP && newMatchup != null) {
- if (EcoreUtil.isAncestor(this, newMatchup))
- {
+ if (EcoreUtil.isAncestor(this, newMatchup)) {
throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
}
NotificationChain msgs = null;
@@ -147,9 +146,9 @@
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.GAME__MATCHUP, newMatchup, newMatchup));
+ } else if (eNotificationRequired()) {
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, BowlingPackage.GAME__MATCHUP, newMatchup, newMatchup));
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java
index 42a8065..6147753 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java
@@ -31,11 +31,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.LeagueImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.LeagueImpl#getPlayers <em>Players</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java
index e0ae909..a0b0590 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java
@@ -32,11 +32,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.MatchupImpl#getGames <em>Games</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.MatchupImpl#getNrSpectators <em>Nr Spectators</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java
index 1306158..8e776ab 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java
@@ -26,12 +26,12 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl#getPrice <em>Price</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl#getSerialNumber <em>Serial Number</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -375,15 +375,13 @@
result.append(", price: "); //$NON-NLS-1$
if (priceESet) {
result.append(price);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(", serialNumber: "); //$NON-NLS-1$
if (serialNumberESet) {
result.append(serialNumber);
- }
- else {
+ } else {
result.append("<unset>"); //$NON-NLS-1$
}
result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java
index 69ef7c8..4aa3141 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java
@@ -36,6 +36,7 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -43,12 +44,11 @@
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#isIsProfessional <em>Is Professional</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getEMails <em>EMails</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getNumberOfVictories <em>Number Of Victories</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getPlayedTournamentTypes <em>Played Tournament Types
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getPlayedTournamentTypes <em>Played Tournament Types</em>
+ * }</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getWinLossRatio <em>Win Loss Ratio</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getGender <em>Gender</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -463,12 +463,10 @@
public boolean validate(DiagnosticChain chain, Map<?, ?> context) {
if (getHeight() > 10) {
if (chain != null) {
- chain.add
- (new BasicDiagnostic
- (Diagnostic.ERROR,
- BowlingValidator.DIAGNOSTIC_SOURCE,
- BowlingValidator.PLAYER__VALIDATE, "Height seems too big.", //$NON-NLS-1$
- new Object[] { this, BowlingPackage.eINSTANCE.getPlayer_Height() }));
+ chain.add(new BasicDiagnostic(Diagnostic.ERROR,
+ BowlingValidator.DIAGNOSTIC_SOURCE,
+ BowlingValidator.PLAYER__VALIDATE, "Height seems too big.", //$NON-NLS-1$
+ new Object[] { this, BowlingPackage.eINSTANCE.getPlayer_Height() }));
}
return false;
}
@@ -614,8 +612,8 @@
case BowlingPackage.PLAYER__PLAYED_TOURNAMENT_TYPES:
return playedTournamentTypes != null && !playedTournamentTypes.isEmpty();
case BowlingPackage.PLAYER__WIN_LOSS_RATIO:
- return WIN_LOSS_RATIO_EDEFAULT == null ? winLossRatio != null : !WIN_LOSS_RATIO_EDEFAULT
- .equals(winLossRatio);
+ return WIN_LOSS_RATIO_EDEFAULT == null ? winLossRatio != null
+ : !WIN_LOSS_RATIO_EDEFAULT.equals(winLossRatio);
case BowlingPackage.PLAYER__GENDER:
return gender != GENDER_EDEFAULT;
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java
index bb6357a..fef2d1e 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java
@@ -27,11 +27,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerToPointsMapImpl#getTypedKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerToPointsMapImpl#getTypedValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -130,7 +130,8 @@
final Player oldKey = key;
key = newKey;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER_TO_POINTS_MAP__KEY, oldKey, key));
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER_TO_POINTS_MAP__KEY, oldKey, key));
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java
index b4a4a5d..146b6c8 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java
@@ -27,11 +27,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeImpl#getDateOfBirth <em>Date Of Birth</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeImpl#getLeague <em>League</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -108,8 +108,8 @@
final XMLGregorianCalendar oldDateOfBirth = dateOfBirth;
dateOfBirth = newDateOfBirth;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE__DATE_OF_BIRTH,
- oldDateOfBirth, dateOfBirth));
+ eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE__DATE_OF_BIRTH, oldDateOfBirth,
+ dateOfBirth));
}
}
@@ -125,8 +125,8 @@
league = (League) eResolveProxy(oldLeague);
if (league != oldLeague) {
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.REFEREE__LEAGUE,
- oldLeague, league));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.REFEREE__LEAGUE, oldLeague,
+ league));
}
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java
index c6202b7..622c5af 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java
@@ -29,11 +29,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeToGamesMapImpl#getTypedKey <em>Key</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeToGamesMapImpl#getTypedValue <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -93,8 +93,8 @@
key = (Referee) eResolveProxy(oldKey);
if (key != oldKey) {
final InternalEObject newKey = (InternalEObject) key;
- NotificationChain msgs = oldKey.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, null);
+ NotificationChain msgs = oldKey.eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, null);
if (newKey.eInternalContainer() == null) {
msgs = newKey.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY,
null, msgs);
@@ -152,19 +152,18 @@
if (newKey != key) {
NotificationChain msgs = null;
if (key != null) {
- msgs = ((InternalEObject) key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
+ msgs = ((InternalEObject) key).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
}
if (newKey != null) {
- msgs = ((InternalEObject) newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
+ msgs = ((InternalEObject) newKey).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
}
msgs = basicSetTypedKey(newKey, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, newKey,
newKey));
}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java
index 00bae21..76ae524 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java
@@ -42,6 +42,7 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getMatchups <em>Matchups</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getType <em>Type</em>}</li>
@@ -52,7 +53,6 @@
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getReceivesTrophy <em>Receives Trophy</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getMatchDays <em>Match Days</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java
index 94e1667..88acd6e 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java
@@ -90,9 +90,7 @@
return doSwitch(theEClass.getClassifierID(), theEObject);
}
final List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java
index 0455d84..55356e9 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java
@@ -97,7 +97,6 @@
* <!-- end-user-doc -->
*
* @generated
- * @since 1.5
*/
protected XMLTypeValidator xmlTypeValidator;
@@ -133,7 +132,8 @@
* @generated
*/
@Override
- protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics,
+ Map<Object, Object> context) {
switch (classifierID) {
case BowlingPackage.PLAYER:
return validatePlayer((Player) value, diagnostics, context);
@@ -312,7 +312,8 @@
*
* @generated
*/
- public boolean validateMerchandise(Merchandise merchandise, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ public boolean validateMerchandise(Merchandise merchandise, DiagnosticChain diagnostics,
+ Map<Object, Object> context) {
return validate_EveryDefaultConstraint(merchandise, diagnostics, context);
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
index 717878f..1855f29 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java
index e322c82..4b8a6e7 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java
@@ -20,8 +20,7 @@
*
* @generated
*/
-public final class ConfigEditPlugin extends EMFPlugin
-{
+public final class ConfigEditPlugin extends EMFPlugin {
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -47,11 +46,9 @@
*
* @generated
*/
- public ConfigEditPlugin()
- {
- super(new ResourceLocator[]
- {
- });
+ public ConfigEditPlugin() {
+ super(new ResourceLocator[] {
+ });
}
/**
@@ -63,8 +60,7 @@
* @generated
*/
@Override
- public ResourceLocator getPluginResourceLocator()
- {
+ public ResourceLocator getPluginResourceLocator() {
return plugin;
}
@@ -76,8 +72,7 @@
* @return the singleton instance.
* @generated
*/
- public static Implementation getPlugin()
- {
+ public static Implementation getPlugin() {
return plugin;
}
@@ -88,8 +83,7 @@
*
* @generated
*/
- public static class Implementation extends EclipsePlugin
- {
+ public static class Implementation extends EclipsePlugin {
/**
* Creates an instance.
* <!-- begin-user-doc -->
@@ -97,8 +91,7 @@
*
* @generated
*/
- public Implementation()
- {
+ public Implementation() {
super();
// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java
index e61b4e9..b2f37ce 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java
@@ -41,8 +41,7 @@
* @generated
*/
public class ConfigItemProviderAdapterFactory extends ConfigAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable
-{
+ IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
@@ -77,8 +76,7 @@
*
* @generated
*/
- public ConfigItemProviderAdapterFactory()
- {
+ public ConfigItemProviderAdapterFactory() {
supportedTypes.add(IEditingDomainItemProvider.class);
supportedTypes.add(IStructuredItemContentProvider.class);
supportedTypes.add(ITreeItemContentProvider.class);
@@ -104,10 +102,8 @@
* @generated
*/
@Override
- public Adapter createTestConfigAdapter()
- {
- if (testConfigItemProvider == null)
- {
+ public Adapter createTestConfigAdapter() {
+ if (testConfigItemProvider == null) {
testConfigItemProvider = new TestConfigItemProvider(this);
}
@@ -132,10 +128,8 @@
* @generated
*/
@Override
- public Adapter createTestRunAdapter()
- {
- if (testRunItemProvider == null)
- {
+ public Adapter createTestRunAdapter() {
+ if (testRunItemProvider == null) {
testRunItemProvider = new TestRunItemProvider(this);
}
@@ -160,10 +154,8 @@
* @generated
*/
@Override
- public Adapter createTestResultAdapter()
- {
- if (testResultItemProvider == null)
- {
+ public Adapter createTestResultAdapter() {
+ if (testResultItemProvider == null) {
testResultItemProvider = new TestResultItemProvider(this);
}
@@ -188,10 +180,8 @@
* @generated
*/
@Override
- public Adapter createTestDiffAdapter()
- {
- if (testDiffItemProvider == null)
- {
+ public Adapter createTestDiffAdapter() {
+ if (testDiffItemProvider == null) {
testDiffItemProvider = new TestDiffItemProvider(this);
}
@@ -216,10 +206,8 @@
* @generated
*/
@Override
- public Adapter createDiffReportAdapter()
- {
- if (diffReportItemProvider == null)
- {
+ public Adapter createDiffReportAdapter() {
+ if (diffReportItemProvider == null) {
diffReportItemProvider = new DiffReportItemProvider(this);
}
@@ -244,10 +232,8 @@
* @generated
*/
@Override
- public Adapter createRootAdapter()
- {
- if (rootItemProvider == null)
- {
+ public Adapter createRootAdapter() {
+ if (rootItemProvider == null) {
rootItemProvider = new RootItemProvider(this);
}
@@ -272,10 +258,8 @@
* @generated
*/
@Override
- public Adapter createMutatorConfigAdapter()
- {
- if (mutatorConfigItemProvider == null)
- {
+ public Adapter createMutatorConfigAdapter() {
+ if (mutatorConfigItemProvider == null) {
mutatorConfigItemProvider = new MutatorConfigItemProvider(this);
}
@@ -289,8 +273,7 @@
*
* @generated
*/
- public ComposeableAdapterFactory getRootAdapterFactory()
- {
+ public ComposeableAdapterFactory getRootAdapterFactory() {
return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
}
@@ -301,8 +284,7 @@
*
* @generated
*/
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
- {
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
@@ -313,8 +295,7 @@
* @generated
*/
@Override
- public boolean isFactoryForType(Object type)
- {
+ public boolean isFactoryForType(Object type) {
return supportedTypes.contains(type) || super.isFactoryForType(type);
}
@@ -326,8 +307,7 @@
* @generated
*/
@Override
- public Adapter adapt(Notifier notifier, Object type)
- {
+ public Adapter adapt(Notifier notifier, Object type) {
return super.adapt(notifier, this);
}
@@ -338,13 +318,10 @@
* @generated
*/
@Override
- public Object adapt(Object object, Object type)
- {
- if (isFactoryForType(type))
- {
+ public Object adapt(Object object, Object type) {
+ if (isFactoryForType(type)) {
final Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
- {
+ if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
return adapter;
}
}
@@ -359,8 +336,7 @@
*
* @generated
*/
- public void addListener(INotifyChangedListener notifyChangedListener)
- {
+ public void addListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.addListener(notifyChangedListener);
}
@@ -371,8 +347,7 @@
*
* @generated
*/
- public void removeListener(INotifyChangedListener notifyChangedListener)
- {
+ public void removeListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.removeListener(notifyChangedListener);
}
@@ -383,12 +358,10 @@
*
* @generated
*/
- public void fireNotifyChanged(Notification notification)
- {
+ public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null)
- {
+ if (parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -400,8 +373,7 @@
*
* @generated
*/
- public void dispose()
- {
+ public void dispose() {
if (testConfigItemProvider != null) {
testConfigItemProvider.dispose();
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java
index 65901a6..ab30670 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java
@@ -38,11 +38,8 @@
public class DiffReportItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -50,8 +47,7 @@
*
* @generated
*/
- public DiffReportItemProvider(AdapterFactory adapterFactory)
- {
+ public DiffReportItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -63,10 +59,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
@@ -83,10 +77,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ConfigPackage.Literals.DIFF_REPORT__DIFFS);
}
@@ -100,8 +92,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -116,8 +107,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/DiffReport")); //$NON-NLS-1$
}
@@ -129,8 +119,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
return getString("_UI_DiffReport_type"); //$NON-NLS-1$
}
@@ -143,12 +132,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(DiffReport.class))
- {
+ switch (notification.getFeatureID(DiffReport.class)) {
case ConfigPackage.DIFF_REPORT__DIFFS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
@@ -165,14 +152,11 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.DIFF_REPORT__DIFFS,
- ConfigFactory.eINSTANCE.createTestDiff()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.DIFF_REPORT__DIFFS,
+ ConfigFactory.eINSTANCE.createTestDiff()));
}
/**
@@ -183,8 +167,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java
index 6c575e8..7d75861 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java
@@ -39,11 +39,8 @@
public class MutatorConfigItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -51,8 +48,7 @@
*
* @generated
*/
- public MutatorConfigItemProvider(AdapterFactory adapterFactory)
- {
+ public MutatorConfigItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -64,10 +60,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addRootEClassPropertyDescriptor(object);
@@ -92,16 +86,13 @@
*
* @generated
*/
- protected void addRootEClassPropertyDescriptor(Object object)
- {
+ protected void addRootEClassPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_rootEClass_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_rootEClass_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_rootEClass_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__ROOT_ECLASS,
true,
false,
@@ -118,16 +109,13 @@
*
* @generated
*/
- protected void addMinObjectsCountPropertyDescriptor(Object object)
- {
+ protected void addMinObjectsCountPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_minObjectsCount_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_minObjectsCount_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_minObjectsCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__MIN_OBJECTS_COUNT,
true,
false,
@@ -144,16 +132,13 @@
*
* @generated
*/
- protected void addIgnoreAndLogPropertyDescriptor(Object object)
- {
+ protected void addIgnoreAndLogPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_ignoreAndLog_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ignoreAndLog_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ignoreAndLog_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__IGNORE_AND_LOG,
true,
false,
@@ -170,16 +155,13 @@
*
* @generated
*/
- protected void addDoNotGenerateRootPropertyDescriptor(Object object)
- {
+ protected void addDoNotGenerateRootPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_doNotGenerateRoot_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_doNotGenerateRoot_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_doNotGenerateRoot_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT,
true,
false,
@@ -190,22 +172,19 @@
}
/**
- * This adds a property descriptor for the Use Ecore ESFuzzyUtil Delete feature.
+ * This adds a property descriptor for the Use Ecore Util Delete feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
*/
- protected void addUseEcoreUtilDeletePropertyDescriptor(Object object)
- {
+ protected void addUseEcoreUtilDeletePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_useEcoreUtilDelete_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_useEcoreUtilDelete_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_useEcoreUtilDelete_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__USE_ECORE_UTIL_DELETE,
true,
false,
@@ -222,16 +201,13 @@
*
* @generated
*/
- protected void addEClassesToIgnorePropertyDescriptor(Object object)
- {
+ protected void addEClassesToIgnorePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_eClassesToIgnore_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eClassesToIgnore_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eClassesToIgnore_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__ECLASSES_TO_IGNORE,
true,
false,
@@ -248,16 +224,13 @@
*
* @generated
*/
- protected void addEStructuralFeaturesToIgnorePropertyDescriptor(Object object)
- {
+ protected void addEStructuralFeaturesToIgnorePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_eStructuralFeaturesToIgnore_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eStructuralFeaturesToIgnore_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eStructuralFeaturesToIgnore_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__ESTRUCTURAL_FEATURES_TO_IGNORE,
true,
false,
@@ -274,16 +247,13 @@
*
* @generated
*/
- protected void addEPackagesPropertyDescriptor(Object object)
- {
+ protected void addEPackagesPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_ePackages_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ePackages_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ePackages_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__EPACKAGES,
true,
false,
@@ -300,16 +270,13 @@
*
* @generated
*/
- protected void addMaxDeleteCountPropertyDescriptor(Object object)
- {
+ protected void addMaxDeleteCountPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_maxDeleteCount_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_maxDeleteCount_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_maxDeleteCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__MAX_DELETE_COUNT,
true,
false,
@@ -326,16 +293,13 @@
*
* @generated
*/
- protected void addMutationCountPropertyDescriptor(Object object)
- {
+ protected void addMutationCountPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_mutationCount_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_mutationCount_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_mutationCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__MUTATION_COUNT,
true,
false,
@@ -352,16 +316,13 @@
*
* @generated
*/
- protected void addAllowDuplicateIDsPropertyDescriptor(Object object)
- {
+ protected void addAllowDuplicateIDsPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_MutatorConfig_allowDuplicateIDs_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_MutatorConfig_allowDuplicateIDs_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_allowDuplicateIDs_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_MutatorConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.MUTATOR_CONFIG__ALLOW_DUPLICATE_IDS,
true,
false,
@@ -379,8 +340,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/MutatorConfig")); //$NON-NLS-1$
}
@@ -392,8 +352,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final MutatorConfig mutatorConfig = (MutatorConfig) object;
return getString("_UI_MutatorConfig_type") + " " + mutatorConfig.getMinObjectsCount(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -407,12 +366,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(MutatorConfig.class))
- {
+ switch (notification.getFeatureID(MutatorConfig.class)) {
case ConfigPackage.MUTATOR_CONFIG__MIN_OBJECTS_COUNT:
case ConfigPackage.MUTATOR_CONFIG__IGNORE_AND_LOG:
case ConfigPackage.MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT:
@@ -435,8 +392,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -448,8 +404,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java
index efb2e2a..46dd2ee 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java
@@ -38,11 +38,8 @@
public class RootItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -50,8 +47,7 @@
*
* @generated
*/
- public RootItemProvider(AdapterFactory adapterFactory)
- {
+ public RootItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -63,10 +59,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
@@ -83,10 +77,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ConfigPackage.Literals.ROOT__ELEMENTS);
}
@@ -100,8 +92,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -116,8 +107,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/Root")); //$NON-NLS-1$
}
@@ -129,8 +119,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
return getString("_UI_Root_type"); //$NON-NLS-1$
}
@@ -143,12 +132,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Root.class))
- {
+ switch (notification.getFeatureID(Root.class)) {
case ConfigPackage.ROOT__ELEMENTS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
@@ -165,44 +152,29 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createTestConfig()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createTestConfig()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createTestRun()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createTestRun()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createTestResult()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createTestResult()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createTestDiff()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createTestDiff()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createDiffReport()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createDiffReport()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createRoot()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createRoot()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.ROOT__ELEMENTS,
- ConfigFactory.eINSTANCE.createMutatorConfig()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+ ConfigFactory.eINSTANCE.createMutatorConfig()));
}
/**
@@ -213,8 +185,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java
index c26f7b0..9982cd1 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java
@@ -40,11 +40,8 @@
public class TestConfigItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -52,8 +49,7 @@
*
* @generated
*/
- public TestConfigItemProvider(AdapterFactory adapterFactory)
- {
+ public TestConfigItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -65,10 +61,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addSeedPropertyDescriptor(object);
@@ -86,11 +80,9 @@
*
* @generated
*/
- protected void addSeedPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addSeedPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestConfig_seed_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_seed_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -110,11 +102,9 @@
*
* @generated
*/
- protected void addCountPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addCountPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestConfig_count_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_count_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -128,21 +118,19 @@
}
/**
- * This adds a property descriptor for the ESFuzzyTest Class feature.
+ * This adds a property descriptor for the Test Class feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
*/
- protected void addTestClassPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addTestClassPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestConfig_testClass_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestConfig_testClass_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_testClass_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestConfig_type"), //$NON-NLS-1$
ConfigPackage.Literals.TEST_CONFIG__TEST_CLASS,
true,
false,
@@ -159,11 +147,9 @@
*
* @generated
*/
- protected void addIdPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addIdPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestConfig_id_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_id_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -186,10 +172,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ConfigPackage.Literals.TEST_CONFIG__MUTATOR_CONFIG);
}
@@ -203,8 +187,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -219,8 +202,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestConfig")); //$NON-NLS-1$
}
@@ -232,11 +214,9 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final String label = ((TestConfig) object).getId();
- return label == null || label.length() == 0 ?
- getString("_UI_TestConfig_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TestConfig_type") : //$NON-NLS-1$
getString("_UI_TestConfig_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -249,12 +229,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TestConfig.class))
- {
+ switch (notification.getFeatureID(TestConfig.class)) {
case ConfigPackage.TEST_CONFIG__SEED:
case ConfigPackage.TEST_CONFIG__COUNT:
case ConfigPackage.TEST_CONFIG__TEST_CLASS:
@@ -277,14 +255,11 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.TEST_CONFIG__MUTATOR_CONFIG,
- ConfigFactory.eINSTANCE.createMutatorConfig()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_CONFIG__MUTATOR_CONFIG,
+ ConfigFactory.eINSTANCE.createMutatorConfig()));
}
/**
@@ -295,8 +270,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java
index 2938dd0..31dea07 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java
@@ -41,11 +41,8 @@
public class TestDiffItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -53,8 +50,7 @@
*
* @generated
*/
- public TestDiffItemProvider(AdapterFactory adapterFactory)
- {
+ public TestDiffItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -66,10 +62,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addLastUpdatePropertyDescriptor(object);
@@ -85,12 +79,9 @@
*
* @generated
*/
- protected void addLastUpdatePropertyDescriptor(Object object)
- {
+ protected void addLastUpdatePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestDiff_lastUpdate_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestDiff_lastUpdate_feature", "_UI_TestDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -110,11 +101,9 @@
*
* @generated
*/
- protected void addConfigPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addConfigPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestDiff_config_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestDiff_config_feature", "_UI_TestDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -137,10 +126,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ConfigPackage.Literals.TEST_DIFF__OLD_RESULT);
childrenFeatures.add(ConfigPackage.Literals.TEST_DIFF__NEW_RESULT);
@@ -155,8 +142,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -171,8 +157,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestDiff")); //$NON-NLS-1$
}
@@ -184,12 +169,10 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final Date labelValue = ((TestDiff) object).getLastUpdate();
final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_TestDiff_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TestDiff_type") : //$NON-NLS-1$
getString("_UI_TestDiff_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -202,12 +185,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TestDiff.class))
- {
+ switch (notification.getFeatureID(TestDiff.class)) {
case ConfigPackage.TEST_DIFF__LAST_UPDATE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
@@ -228,19 +209,14 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.TEST_DIFF__OLD_RESULT,
- ConfigFactory.eINSTANCE.createTestResult()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_DIFF__OLD_RESULT,
+ ConfigFactory.eINSTANCE.createTestResult()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.TEST_DIFF__NEW_RESULT,
- ConfigFactory.eINSTANCE.createTestResult()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_DIFF__NEW_RESULT,
+ ConfigFactory.eINSTANCE.createTestResult()));
}
/**
@@ -251,17 +227,14 @@
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
- {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
final Object childFeature = feature;
final Object childObject = child;
- final boolean qualify =
- childFeature == ConfigPackage.Literals.TEST_DIFF__OLD_RESULT ||
- childFeature == ConfigPackage.Literals.TEST_DIFF__NEW_RESULT;
+ final boolean qualify = childFeature == ConfigPackage.Literals.TEST_DIFF__OLD_RESULT ||
+ childFeature == ConfigPackage.Literals.TEST_DIFF__NEW_RESULT;
- if (qualify)
- {
+ if (qualify) {
return getString("_UI_CreateChild_text2", //$NON-NLS-1$
new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
@@ -276,8 +249,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java
index 910c2e4..299863d 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java
@@ -38,11 +38,8 @@
public class TestResultItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -50,8 +47,7 @@
*
* @generated
*/
- public TestResultItemProvider(AdapterFactory adapterFactory)
- {
+ public TestResultItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -63,10 +59,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addSeedCountPropertyDescriptor(object);
@@ -85,15 +79,13 @@
*
* @generated
*/
- protected void addSeedCountPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addSeedCountPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestResult_seedCount_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestResult_seedCount_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestResult_seedCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestResult_type"), //$NON-NLS-1$
ConfigPackage.Literals.TEST_RESULT__SEED_COUNT,
true,
false,
@@ -104,21 +96,19 @@
}
/**
- * This adds a property descriptor for the ESFuzzyTest Name feature.
+ * This adds a property descriptor for the Test Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
*/
- protected void addTestNamePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addTestNamePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestResult_testName_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestResult_testName_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestResult_testName_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestResult_type"), //$NON-NLS-1$
ConfigPackage.Literals.TEST_RESULT__TEST_NAME,
true,
false,
@@ -135,11 +125,9 @@
*
* @generated
*/
- protected void addErrorPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addErrorPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestResult_error_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestResult_error_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -159,15 +147,13 @@
*
* @generated
*/
- protected void addFailurePropertyDescriptor(Object object)
- {
+ protected void addFailurePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestResult_failure_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TestResult_failure_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestResult_failure_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestResult_type"), //$NON-NLS-1$
ConfigPackage.Literals.TEST_RESULT__FAILURE,
true,
false,
@@ -184,16 +170,13 @@
*
* @generated
*/
- protected void addExecutionTimePropertyDescriptor(Object object)
- {
+ protected void addExecutionTimePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestResult_executionTime_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestResult_executionTime_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestResult_executionTime_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestResult_type"), //$NON-NLS-1$
ConfigPackage.Literals.TEST_RESULT__EXECUTION_TIME,
true,
false,
@@ -211,8 +194,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestResult")); //$NON-NLS-1$
}
@@ -224,11 +206,9 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final String label = ((TestResult) object).getTestName();
- return label == null || label.length() == 0 ?
- getString("_UI_TestResult_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TestResult_type") : //$NON-NLS-1$
getString("_UI_TestResult_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -241,12 +221,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TestResult.class))
- {
+ switch (notification.getFeatureID(TestResult.class)) {
case ConfigPackage.TEST_RESULT__SEED_COUNT:
case ConfigPackage.TEST_RESULT__TEST_NAME:
case ConfigPackage.TEST_RESULT__ERROR:
@@ -267,8 +245,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -280,8 +257,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java
index 591793f..8f823e0 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java
@@ -41,11 +41,8 @@
public class TestRunItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -53,8 +50,7 @@
*
* @generated
*/
- public TestRunItemProvider(AdapterFactory adapterFactory)
- {
+ public TestRunItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -66,10 +62,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addTimePropertyDescriptor(object);
@@ -84,11 +78,9 @@
*
* @generated
*/
- protected void addTimePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addTimePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestRun_time_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestRun_time_feature", "_UI_TestRun_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -111,10 +103,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(ConfigPackage.Literals.TEST_RUN__CONFIG);
childrenFeatures.add(ConfigPackage.Literals.TEST_RUN__RESULTS);
@@ -129,8 +119,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -145,8 +134,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestRun")); //$NON-NLS-1$
}
@@ -158,12 +146,10 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final Date labelValue = ((TestRun) object).getTime();
final String label = labelValue == null ? null : labelValue.toString();
- return label == null || label.length() == 0 ?
- getString("_UI_TestRun_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TestRun_type") : //$NON-NLS-1$
getString("_UI_TestRun_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -176,12 +162,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TestRun.class))
- {
+ switch (notification.getFeatureID(TestRun.class)) {
case ConfigPackage.TEST_RUN__TIME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
@@ -202,19 +186,14 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.TEST_RUN__CONFIG,
- ConfigFactory.eINSTANCE.createTestConfig()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_RUN__CONFIG,
+ ConfigFactory.eINSTANCE.createTestConfig()));
- newChildDescriptors.add
- (createChildParameter
- (ConfigPackage.Literals.TEST_RUN__RESULTS,
- ConfigFactory.eINSTANCE.createTestResult()));
+ newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_RUN__RESULTS,
+ ConfigFactory.eINSTANCE.createTestResult()));
}
/**
@@ -225,8 +204,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return ConfigEditPlugin.INSTANCE;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
index 8a09c89..eb18e3b 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java
index 242b4c7..1cd07fd 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java
@@ -51,8 +51,7 @@
*/
public class ConfigActionBarContributor
extends EditingDomainActionBarContributor
- implements ISelectionChangedListener
-{
+ implements ISelectionChangedListener {
/**
* This keeps track of the active editor.
* <!-- begin-user-doc -->
@@ -78,22 +77,18 @@
*
* @generated
*/
- protected IAction showPropertiesViewAction =
- new Action(ConfigEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
- {
- @Override
- public void run()
- {
- try
- {
- getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
- }
- catch (final PartInitException exception)
- {
- ConfigEditorPlugin.INSTANCE.log(exception);
- }
+ protected IAction showPropertiesViewAction = new Action(
+ ConfigEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+ {
+ @Override
+ public void run() {
+ try {
+ getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+ } catch (final PartInitException exception) {
+ ConfigEditorPlugin.INSTANCE.log(exception);
}
- };
+ }
+ };
/**
* This action refreshes the viewer of the current editor if the editor
@@ -103,28 +98,24 @@
*
* @generated
*/
- protected IAction refreshViewerAction =
- new Action(ConfigEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
- {
- @Override
- public boolean isEnabled()
- {
- return activeEditorPart instanceof IViewerProvider;
- }
+ protected IAction refreshViewerAction = new Action(
+ ConfigEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+ {
+ @Override
+ public boolean isEnabled() {
+ return activeEditorPart instanceof IViewerProvider;
+ }
- @Override
- public void run()
- {
- if (activeEditorPart instanceof IViewerProvider)
- {
- final Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
- if (viewer != null)
- {
- viewer.refresh();
- }
+ @Override
+ public void run() {
+ if (activeEditorPart instanceof IViewerProvider) {
+ final 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
@@ -171,8 +162,7 @@
*
* @generated
*/
- public ConfigActionBarContributor()
- {
+ public ConfigActionBarContributor() {
super(ADDITIONS_LAST_STYLE);
loadResourceAction = new LoadResourceAction();
validateAction = new ValidateAction();
@@ -187,8 +177,7 @@
* @generated
*/
@Override
- public void contributeToToolBar(IToolBarManager toolBarManager)
- {
+ public void contributeToToolBar(IToolBarManager toolBarManager) {
toolBarManager.add(new Separator("config-settings")); //$NON-NLS-1$
toolBarManager.add(new Separator("config-additions")); //$NON-NLS-1$
}
@@ -202,12 +191,12 @@
* @generated
*/
@Override
- public void contributeToMenu(IMenuManager menuManager)
- {
+ public void contributeToMenu(IMenuManager menuManager) {
super.contributeToMenu(menuManager);
final IMenuManager submenuManager = new MenuManager(
- ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditor_menu"), "org.eclipse.emf.emfstore.internal.fuzzy.emf.configMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+ ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditor_menu"), //$NON-NLS-1$
+ "org.eclipse.emf.emfstore.internal.fuzzy.emf.configMenuID"); //$NON-NLS-1$
menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
submenuManager.add(new Separator("settings")); //$NON-NLS-1$
submenuManager.add(new Separator("actions")); //$NON-NLS-1$
@@ -221,19 +210,17 @@
// Prepare for CreateSibling item addition or removal.
//
- createSiblingMenuManager = new MenuManager(ConfigEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+ createSiblingMenuManager = new MenuManager(
+ ConfigEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
// Force an update because Eclipse hides empty menus now.
//
- submenuManager.addMenuListener
- (new IMenuListener()
- {
- public void menuAboutToShow(IMenuManager menuManager)
- {
- menuManager.updateAll(true);
- }
- });
+ submenuManager.addMenuListener(new IMenuListener() {
+ public void menuAboutToShow(IMenuManager menuManager) {
+ menuManager.updateAll(true);
+ }
+ });
addGlobalActions(submenuManager);
}
@@ -246,30 +233,24 @@
* @generated
*/
@Override
- public void setActiveEditor(IEditorPart part)
- {
+ public void setActiveEditor(IEditorPart part) {
super.setActiveEditor(part);
activeEditorPart = part;
// Switch to the new selection provider.
//
- if (selectionProvider != null)
- {
+ if (selectionProvider != null) {
selectionProvider.removeSelectionChangedListener(this);
}
- if (part == null)
- {
+ if (part == null) {
selectionProvider = null;
- }
- else
- {
+ } else {
selectionProvider = part.getSite().getSelectionProvider();
selectionProvider.addSelectionChangedListener(this);
// Fake a selection changed event to update the menus.
//
- if (selectionProvider.getSelection() != null)
- {
+ if (selectionProvider.getSelection() != null) {
selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
}
}
@@ -284,16 +265,13 @@
*
* @generated
*/
- public void selectionChanged(SelectionChangedEvent event)
- {
+ public void selectionChanged(SelectionChangedEvent event) {
// Remove any menu items for old selection.
//
- if (createChildMenuManager != null)
- {
+ if (createChildMenuManager != null) {
depopulateManager(createChildMenuManager, createChildActions);
}
- if (createSiblingMenuManager != null)
- {
+ if (createSiblingMenuManager != null) {
depopulateManager(createSiblingMenuManager, createSiblingActions);
}
@@ -303,8 +281,7 @@
Collection<?> newSiblingDescriptors = null;
final ISelection selection = event.getSelection();
- if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1)
- {
+ if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
final Object object = ((IStructuredSelection) selection).getFirstElement();
final EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
@@ -318,13 +295,11 @@
createChildActions = generateCreateChildActions(newChildDescriptors, selection);
createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
- if (createChildMenuManager != null)
- {
+ if (createChildMenuManager != null) {
populateManager(createChildMenuManager, createChildActions, null);
createChildMenuManager.update(true);
}
- if (createSiblingMenuManager != null)
- {
+ if (createSiblingMenuManager != null) {
populateManager(createSiblingMenuManager, createSiblingActions, null);
createSiblingMenuManager.update(true);
}
@@ -339,13 +314,10 @@
*
* @generated
*/
- protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
- {
+ protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
final Collection<IAction> actions = new ArrayList<IAction>();
- if (descriptors != null)
- {
- for (final Object descriptor : descriptors)
- {
+ if (descriptors != null) {
+ for (final Object descriptor : descriptors) {
actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
}
}
@@ -361,13 +333,10 @@
*
* @generated
*/
- protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
- {
+ protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
final Collection<IAction> actions = new ArrayList<IAction>();
- if (descriptors != null)
- {
- for (final Object descriptor : descriptors)
- {
+ if (descriptors != null) {
+ for (final Object descriptor : descriptors) {
actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
}
}
@@ -385,18 +354,12 @@
* @generated
*/
protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
- String contributionID)
- {
- if (actions != null)
- {
- for (final IAction action : actions)
- {
- if (contributionID != null)
- {
+ String contributionID) {
+ if (actions != null) {
+ for (final IAction action : actions) {
+ if (contributionID != null) {
manager.insertBefore(contributionID, action);
- }
- else
- {
+ } else {
manager.add(action);
}
}
@@ -411,28 +374,22 @@
*
* @generated
*/
- protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions)
- {
- if (actions != null)
- {
+ protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+ if (actions != null) {
final IContributionItem[] items = manager.getItems();
- for (int i = 0; i < items.length; i++)
- {
+ for (int i = 0; i < items.length; i++) {
// Look into SubContributionItems
//
IContributionItem contributionItem = items[i];
- while (contributionItem instanceof SubContributionItem)
- {
+ while (contributionItem instanceof SubContributionItem) {
contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
}
// Delete the ActionContributionItems with matching action.
//
- if (contributionItem instanceof ActionContributionItem)
- {
+ if (contributionItem instanceof ActionContributionItem) {
final IAction action = ((ActionContributionItem) contributionItem).getAction();
- if (actions.contains(action))
- {
+ if (actions.contains(action)) {
manager.remove(contributionItem);
}
}
@@ -448,8 +405,7 @@
* @generated
*/
@Override
- public void menuAboutToShow(IMenuManager menuManager)
- {
+ public void menuAboutToShow(IMenuManager menuManager) {
super.menuAboutToShow(menuManager);
MenuManager submenuManager = null;
@@ -470,8 +426,7 @@
* @generated
*/
@Override
- protected void addGlobalActions(IMenuManager menuManager)
- {
+ protected void addGlobalActions(IMenuManager menuManager) {
menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
@@ -489,8 +444,7 @@
* @generated
*/
@Override
- protected boolean removeAllReferencesOnDelete()
- {
+ protected boolean removeAllReferencesOnDelete() {
return true;
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java
index b200102..b051e06 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java
@@ -133,8 +133,7 @@
*/
public class ConfigEditor
extends MultiPageEditorPart
- implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
-{
+ implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
/**
* This keeps track of the editing domain that is used to track all changes to the model.
* <!-- begin-user-doc -->
@@ -310,54 +309,40 @@
*
* @generated
*/
- protected IPartListener partListener =
- new IPartListener()
- {
- public void partActivated(IWorkbenchPart p)
- {
- if (p instanceof ContentOutline)
- {
- if (((ContentOutline) p).getCurrentPage() == contentOutlinePage)
- {
- getActionBarContributor().setActiveEditor(ConfigEditor.this);
+ protected IPartListener partListener = new IPartListener() {
+ public void partActivated(IWorkbenchPart p) {
+ if (p instanceof ContentOutline) {
+ if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
+ getActionBarContributor().setActiveEditor(ConfigEditor.this);
- setCurrentViewer(contentOutlineViewer);
- }
+ setCurrentViewer(contentOutlineViewer);
}
- else if (p instanceof PropertySheet)
- {
- if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage()))
- {
- getActionBarContributor().setActiveEditor(ConfigEditor.this);
- handleActivate();
- }
- }
- else if (p == ConfigEditor.this)
- {
+ } else if (p instanceof PropertySheet) {
+ if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {
+ getActionBarContributor().setActiveEditor(ConfigEditor.this);
handleActivate();
}
+ } else if (p == ConfigEditor.this) {
+ handleActivate();
}
+ }
- public void partBroughtToTop(IWorkbenchPart p)
- {
- // Ignore.
- }
+ public void partBroughtToTop(IWorkbenchPart p) {
+ // Ignore.
+ }
- public void partClosed(IWorkbenchPart p)
- {
- // Ignore.
- }
+ public void partClosed(IWorkbenchPart p) {
+ // Ignore.
+ }
- public void partDeactivated(IWorkbenchPart p)
- {
- // Ignore.
- }
+ public void partDeactivated(IWorkbenchPart p) {
+ // Ignore.
+ }
- public void partOpened(IWorkbenchPart p)
- {
- // Ignore.
- }
- };
+ public void partOpened(IWorkbenchPart p) {
+ // Ignore.
+ }
+ };
/**
* Resources that have been removed since last activation.
@@ -411,76 +396,55 @@
*
* @generated
*/
- protected EContentAdapter problemIndicationAdapter =
- new EContentAdapter()
- {
- @Override
- public void notifyChanged(Notification notification)
- {
- if (notification.getNotifier() instanceof Resource)
- {
- switch (notification.getFeatureID(Resource.class))
- {
- case Resource.RESOURCE__IS_LOADED:
- case Resource.RESOURCE__ERRORS:
- case Resource.RESOURCE__WARNINGS:
- {
- final Resource resource = (Resource) notification.getNotifier();
- final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
- if (diagnostic.getSeverity() != Diagnostic.OK)
- {
- resourceToDiagnosticMap.put(resource, diagnostic);
- }
- else
- {
- resourceToDiagnosticMap.remove(resource);
- }
-
- if (updateProblemIndication)
- {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- updateProblemIndication();
- }
- });
- }
- break;
+ protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
+ @Override
+ public void notifyChanged(Notification notification) {
+ if (notification.getNotifier() instanceof Resource) {
+ switch (notification.getFeatureID(Resource.class)) {
+ case Resource.RESOURCE__IS_LOADED:
+ case Resource.RESOURCE__ERRORS:
+ case Resource.RESOURCE__WARNINGS: {
+ final Resource resource = (Resource) notification.getNotifier();
+ final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ resourceToDiagnosticMap.put(resource, diagnostic);
+ } else {
+ resourceToDiagnosticMap.remove(resource);
}
- }
- }
- else
- {
- super.notifyChanged(notification);
- }
- }
- @Override
- protected void setTarget(Resource target)
- {
- basicSetTarget(target);
- }
-
- @Override
- protected void unsetTarget(Resource target)
- {
- basicUnsetTarget(target);
- resourceToDiagnosticMap.remove(target);
- if (updateProblemIndication)
- {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
updateProblemIndication();
}
});
+ }
+ break;
}
+ }
+ } else {
+ super.notifyChanged(notification);
}
- };
+ }
+
+ @Override
+ protected void setTarget(Resource target) {
+ basicSetTarget(target);
+ }
+
+ @Override
+ protected void unsetTarget(Resource target) {
+ basicUnsetTarget(target);
+ resourceToDiagnosticMap.remove(target);
+ if (updateProblemIndication) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
+ }
+ }
+ };
/**
* This listens for workspace changes.
@@ -489,100 +453,74 @@
*
* @generated
*/
- protected IResourceChangeListener resourceChangeListener =
- new IResourceChangeListener()
- {
- public void resourceChanged(IResourceChangeEvent event)
- {
- final IResourceDelta delta = event.getDelta();
- try
- {
- class ResourceDeltaVisitor implements IResourceDeltaVisitor
- {
- protected ResourceSet resourceSet = editingDomain.getResourceSet();
- protected Collection<Resource> changedResources = new ArrayList<Resource>();
- protected Collection<Resource> removedResources = new ArrayList<Resource>();
+ protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
+ public void resourceChanged(IResourceChangeEvent event) {
+ final IResourceDelta delta = event.getDelta();
+ try {
+ class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+ protected ResourceSet resourceSet = editingDomain.getResourceSet();
+ protected Collection<Resource> changedResources = new ArrayList<Resource>();
+ protected Collection<Resource> removedResources = new ArrayList<Resource>();
- public boolean visit(IResourceDelta delta)
- {
- if (delta.getResource().getType() == IResource.FILE)
- {
- if (delta.getKind() == IResourceDelta.REMOVED ||
- delta.getKind() == IResourceDelta.CHANGED
- && delta.getFlags() != IResourceDelta.MARKERS)
- {
- final Resource resource = resourceSet.getResource(
- URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
- if (resource != null)
- {
- if (delta.getKind() == IResourceDelta.REMOVED)
- {
- removedResources.add(resource);
- }
- else if (!savedResources.remove(resource))
- {
- changedResources.add(resource);
- }
+ public boolean visit(IResourceDelta delta) {
+ if (delta.getResource().getType() == IResource.FILE) {
+ if (delta.getKind() == IResourceDelta.REMOVED ||
+ delta.getKind() == IResourceDelta.CHANGED
+ && delta.getFlags() != IResourceDelta.MARKERS) {
+ final Resource resource = resourceSet.getResource(
+ URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+ if (resource != null) {
+ if (delta.getKind() == IResourceDelta.REMOVED) {
+ removedResources.add(resource);
+ } else if (!savedResources.remove(resource)) {
+ changedResources.add(resource);
}
}
- return false;
}
-
- return true;
+ return false;
}
- public Collection<Resource> getChangedResources()
- {
- return changedResources;
- }
-
- public Collection<Resource> getRemovedResources()
- {
- return removedResources;
- }
+ return true;
}
- final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
- delta.accept(visitor);
-
- if (!visitor.getRemovedResources().isEmpty())
- {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- removedResources.addAll(visitor.getRemovedResources());
- if (!isDirty())
- {
- getSite().getPage().closeEditor(ConfigEditor.this, false);
- }
- }
- });
+ public Collection<Resource> getChangedResources() {
+ return changedResources;
}
- if (!visitor.getChangedResources().isEmpty())
- {
- getSite().getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- changedResources.addAll(visitor.getChangedResources());
- if (getSite().getPage().getActiveEditor() == ConfigEditor.this)
- {
- handleActivate();
- }
- }
- });
+ public Collection<Resource> getRemovedResources() {
+ return removedResources;
}
}
- catch (final CoreException exception)
- {
- ConfigEditorPlugin.INSTANCE.log(exception);
+
+ final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+ delta.accept(visitor);
+
+ if (!visitor.getRemovedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ removedResources.addAll(visitor.getRemovedResources());
+ if (!isDirty()) {
+ getSite().getPage().closeEditor(ConfigEditor.this, false);
+ }
+ }
+ });
}
+
+ if (!visitor.getChangedResources().isEmpty()) {
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ changedResources.addAll(visitor.getChangedResources());
+ if (getSite().getPage().getActiveEditor() == ConfigEditor.this) {
+ handleActivate();
+ }
+ }
+ });
+ }
+ } catch (final CoreException exception) {
+ ConfigEditorPlugin.INSTANCE.log(exception);
}
- };
+ }
+ };
/**
* Handles activation of the editor or it's associated views.
@@ -591,12 +529,10 @@
*
* @generated
*/
- protected void handleActivate()
- {
+ protected void handleActivate() {
// Recompute the read only state.
//
- if (editingDomain.getResourceToReadOnlyMap() != null)
- {
+ if (editingDomain.getResourceToReadOnlyMap() != null) {
editingDomain.getResourceToReadOnlyMap().clear();
// Refresh any actions that may become enabled or disabled.
@@ -604,21 +540,15 @@
setSelection(getSelection());
}
- if (!removedResources.isEmpty())
- {
- if (handleDirtyConflict())
- {
+ if (!removedResources.isEmpty()) {
+ if (handleDirtyConflict()) {
getSite().getPage().closeEditor(ConfigEditor.this, false);
- }
- else
- {
+ } else {
removedResources.clear();
changedResources.clear();
savedResources.clear();
}
- }
- else if (!changedResources.isEmpty())
- {
+ } else if (!changedResources.isEmpty()) {
changedResources.removeAll(savedResources);
handleChangedResources();
changedResources.clear();
@@ -633,37 +563,28 @@
*
* @generated
*/
- protected void handleChangedResources()
- {
- if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))
- {
- if (isDirty())
- {
+ protected void handleChangedResources() {
+ if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+ if (isDirty()) {
changedResources.addAll(editingDomain.getResourceSet().getResources());
}
editingDomain.getCommandStack().flush();
updateProblemIndication = false;
- for (final Resource resource : changedResources)
- {
- if (resource.isLoaded())
- {
+ for (final Resource resource : changedResources) {
+ if (resource.isLoaded()) {
resource.unload();
- try
- {
+ try {
resource.load(Collections.EMPTY_MAP);
- } catch (final IOException exception)
- {
- if (!resourceToDiagnosticMap.containsKey(resource))
- {
+ } catch (final IOException exception) {
+ if (!resourceToDiagnosticMap.containsKey(resource)) {
resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
}
}
}
- if (AdapterFactoryEditingDomain.isStale(editorSelection))
- {
+ if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
setSelection(StructuredSelection.EMPTY);
}
@@ -679,60 +600,45 @@
*
* @generated
*/
- protected void updateProblemIndication()
- {
- if (updateProblemIndication)
- {
- final BasicDiagnostic diagnostic =
- new BasicDiagnostic
- (Diagnostic.OK, "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
- 0,
- null,
- new Object[] { editingDomain.getResourceSet() });
- for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
- {
- if (childDiagnostic.getSeverity() != Diagnostic.OK)
- {
+ protected void updateProblemIndication() {
+ if (updateProblemIndication) {
+ final BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
+ "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
+ 0,
+ null,
+ new Object[] { editingDomain.getResourceSet() });
+ for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+ if (childDiagnostic.getSeverity() != Diagnostic.OK) {
diagnostic.add(childDiagnostic);
}
}
int lastEditorPage = getPageCount() - 1;
- if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart)
- {
+ if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
- if (diagnostic.getSeverity() != Diagnostic.OK)
- {
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
setActivePage(lastEditorPage);
}
- }
- else if (diagnostic.getSeverity() != Diagnostic.OK)
- {
+ } else if (diagnostic.getSeverity() != Diagnostic.OK) {
final ProblemEditorPart problemEditorPart = new ProblemEditorPart();
problemEditorPart.setDiagnostic(diagnostic);
problemEditorPart.setMarkerHelper(markerHelper);
- try
- {
+ try {
addPage(++lastEditorPage, problemEditorPart, getEditorInput());
setPageText(lastEditorPage, problemEditorPart.getPartName());
setActivePage(lastEditorPage);
showTabs();
- } catch (final PartInitException exception)
- {
+ } catch (final PartInitException exception) {
ConfigEditorPlugin.INSTANCE.log(exception);
}
}
- if (markerHelper.hasMarkers(editingDomain.getResourceSet()))
- {
+ if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
markerHelper.deleteMarkers(editingDomain.getResourceSet());
- if (diagnostic.getSeverity() != Diagnostic.OK)
- {
- try
- {
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
+ try {
markerHelper.createMarkers(diagnostic);
- } catch (final CoreException exception)
- {
+ } catch (final CoreException exception) {
ConfigEditorPlugin.INSTANCE.log(exception);
}
}
@@ -747,12 +653,10 @@
*
* @generated
*/
- protected boolean handleDirtyConflict()
- {
- return MessageDialog.openQuestion
- (getSite().getShell(),
- getString("_UI_FileConflict_label"), //$NON-NLS-1$
- getString("_WARN_FileConflict")); //$NON-NLS-1$
+ protected boolean handleDirtyConflict() {
+ return MessageDialog.openQuestion(getSite().getShell(),
+ getString("_UI_FileConflict_label"), //$NON-NLS-1$
+ getString("_WARN_FileConflict")); //$NON-NLS-1$
}
/**
@@ -762,8 +666,7 @@
*
* @generated
*/
- public ConfigEditor()
- {
+ public ConfigEditor() {
super();
initializeEditingDomain();
}
@@ -775,8 +678,7 @@
*
* @generated
*/
- protected void initializeEditingDomain()
- {
+ protected void initializeEditingDomain() {
// Create an adapter factory that yields item providers.
//
adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
@@ -792,42 +694,31 @@
// Add a listener to set the most recent command's affected objects to be the selection of the viewer with
// focus.
//
- commandStack.addCommandStackListener
- (new CommandStackListener()
- {
- public void commandStackChanged(final EventObject event)
- {
- getContainer().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- firePropertyChange(IEditorPart.PROP_DIRTY);
+ commandStack.addCommandStackListener(new CommandStackListener() {
+ public void commandStackChanged(final EventObject event) {
+ getContainer().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ firePropertyChange(IEditorPart.PROP_DIRTY);
- // Try to select the affected objects.
- //
- final Command mostRecentCommand = ((CommandStack) event.getSource())
- .getMostRecentCommand();
- if (mostRecentCommand != null)
- {
- setSelectionToViewer(mostRecentCommand.getAffectedObjects());
- }
- for (final Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();)
- {
- final PropertySheetPage propertySheetPage = i.next();
- if (propertySheetPage.getControl().isDisposed())
- {
- i.remove();
- }
- else
- {
- propertySheetPage.refresh();
- }
- }
+ // Try to select the affected objects.
+ //
+ final Command mostRecentCommand = ((CommandStack) event.getSource())
+ .getMostRecentCommand();
+ if (mostRecentCommand != null) {
+ setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+ }
+ for (final Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {
+ final PropertySheetPage propertySheetPage = i.next();
+ if (propertySheetPage.getControl().isDisposed()) {
+ i.remove();
+ } else {
+ propertySheetPage.refresh();
}
- });
- }
- });
+ }
+ }
+ });
+ }
+ });
// Create the editing domain with a special command stack.
//
@@ -842,8 +733,7 @@
* @generated
*/
@Override
- protected void firePropertyChange(int action)
- {
+ protected void firePropertyChange(int action) {
super.firePropertyChange(action);
}
@@ -854,26 +744,20 @@
*
* @generated
*/
- public void setSelectionToViewer(Collection<?> collection)
- {
+ public void setSelectionToViewer(Collection<?> collection) {
final Collection<?> theSelection = collection;
// Make sure it's okay.
//
- if (theSelection != null && !theSelection.isEmpty())
- {
- final Runnable runnable =
- new Runnable()
- {
- public void run()
- {
- // Try to select the items in the current content viewer of the editor.
- //
- if (currentViewer != null)
- {
- currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
- }
+ if (theSelection != null && !theSelection.isEmpty()) {
+ final Runnable runnable = new Runnable() {
+ public void run() {
+ // Try to select the items in the current content viewer of the editor.
+ //
+ if (currentViewer != null) {
+ currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
}
- };
+ }
+ };
getSite().getShell().getDisplay().asyncExec(runnable);
}
}
@@ -887,8 +771,7 @@
*
* @generated
*/
- public EditingDomain getEditingDomain()
- {
+ public EditingDomain getEditingDomain() {
return editingDomain;
}
@@ -898,16 +781,14 @@
*
* @generated
*/
- public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider
- {
+ public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @generated
*/
- public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory)
- {
+ public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -918,8 +799,7 @@
* @generated
*/
@Override
- public Object[] getElements(Object object)
- {
+ public Object[] getElements(Object object) {
final Object parent = super.getParent(object);
return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
}
@@ -931,8 +811,7 @@
* @generated
*/
@Override
- public Object[] getChildren(Object object)
- {
+ public Object[] getChildren(Object object) {
final Object parent = super.getParent(object);
return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
}
@@ -944,8 +823,7 @@
* @generated
*/
@Override
- public boolean hasChildren(Object object)
- {
+ public boolean hasChildren(Object object) {
final Object parent = super.getParent(object);
return parent != null;
}
@@ -957,8 +835,7 @@
* @generated
*/
@Override
- public Object getParent(Object object)
- {
+ public Object getParent(Object object) {
return null;
}
}
@@ -969,12 +846,9 @@
*
* @generated
*/
- public void setCurrentViewerPane(ViewerPane viewerPane)
- {
- if (currentViewerPane != viewerPane)
- {
- if (currentViewerPane != null)
- {
+ public void setCurrentViewerPane(ViewerPane viewerPane) {
+ if (currentViewerPane != viewerPane) {
+ if (currentViewerPane != null) {
currentViewerPane.showFocus(false);
}
currentViewerPane = viewerPane;
@@ -990,39 +864,31 @@
*
* @generated
*/
- public void setCurrentViewer(Viewer viewer)
- {
+ public void setCurrentViewer(Viewer viewer) {
// If it is changing...
//
- if (currentViewer != viewer)
- {
- if (selectionChangedListener == null)
- {
+ if (currentViewer != viewer) {
+ if (selectionChangedListener == null) {
// Create the listener on demand.
//
- selectionChangedListener =
- new ISelectionChangedListener()
- {
- // This just notifies those things that are affected by the section.
- //
- public void selectionChanged(SelectionChangedEvent selectionChangedEvent)
- {
- setSelection(selectionChangedEvent.getSelection());
- }
- };
+ selectionChangedListener = new ISelectionChangedListener() {
+ // This just notifies those things that are affected by the section.
+ //
+ public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+ setSelection(selectionChangedEvent.getSelection());
+ }
+ };
}
// Stop listening to the old one.
//
- if (currentViewer != null)
- {
+ if (currentViewer != null) {
currentViewer.removeSelectionChangedListener(selectionChangedListener);
}
// Start listening to the new one.
//
- if (viewer != null)
- {
+ if (viewer != null) {
viewer.addSelectionChangedListener(selectionChangedListener);
}
@@ -1043,8 +909,7 @@
*
* @generated
*/
- public Viewer getViewer()
- {
+ public Viewer getViewer() {
return currentViewer;
}
@@ -1055,8 +920,7 @@
*
* @generated
*/
- protected void createContextMenuFor(StructuredViewer viewer)
- {
+ protected void createContextMenuFor(StructuredViewer viewer) {
final MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
contextMenu.add(new Separator("additions")); //$NON-NLS-1$
contextMenu.setRemoveAllWhenShown(true);
@@ -1078,25 +942,21 @@
*
* @generated
*/
- public void createModel()
- {
+ public void createModel() {
final URI resourceURI = EditUIUtil.getURI(getEditorInput());
Exception exception = null;
Resource resource = null;
- try
- {
+ try {
// Load the resource through the editing domain.
//
resource = editingDomain.getResourceSet().getResource(resourceURI, true);
- } catch (final Exception e)
- {
+ } catch (final Exception e) {
exception = e;
resource = editingDomain.getResourceSet().getResource(resourceURI, false);
}
final Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
- if (diagnostic.getSeverity() != Diagnostic.OK)
- {
+ if (diagnostic.getSeverity() != Diagnostic.OK) {
resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
@@ -1110,28 +970,21 @@
*
* @generated
*/
- public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
- {
- if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
- {
- final BasicDiagnostic basicDiagnostic =
- new BasicDiagnostic
- (Diagnostic.ERROR, "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
- 0,
- getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
- new Object[] { exception == null ? (Object) resource : exception });
+ public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+ if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+ final BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
+ "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
+ 0,
+ getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+ new Object[] { exception == null ? (Object) resource : exception });
basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
return basicDiagnostic;
- }
- else if (exception != null)
- {
+ } else if (exception != null) {
return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
0,
getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
new Object[] { exception });
- }
- else
- {
+ } else {
return Diagnostic.OK_INSTANCE;
}
}
@@ -1144,37 +997,31 @@
* @generated
*/
@Override
- public void createPages()
- {
+ public void createPages() {
// Creates the model from the editor input
//
createModel();
// Only creates the other pages if there is something that can be edited
//
- if (!getEditingDomain().getResourceSet().getResources().isEmpty())
- {
+ if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
// Create a page for the selection tree view.
//
{
- final ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ConfigEditor.this)
- {
- @Override
- public Viewer createViewer(Composite composite)
- {
- final Tree tree = new Tree(composite, SWT.MULTI);
- final TreeViewer newTreeViewer = new TreeViewer(tree);
- return newTreeViewer;
- }
+ final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ final Tree tree = new Tree(composite, SWT.MULTI);
+ final TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
- @Override
- public void requestActivation()
- {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
selectionViewer = (TreeViewer) viewerPane.getViewer();
@@ -1196,24 +1043,20 @@
// Create a page for the parent tree view.
//
{
- final ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ConfigEditor.this)
- {
- @Override
- public Viewer createViewer(Composite composite)
- {
- final Tree tree = new Tree(composite, SWT.MULTI);
- final TreeViewer newTreeViewer = new TreeViewer(tree);
- return newTreeViewer;
- }
+ final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ final Tree tree = new Tree(composite, SWT.MULTI);
+ final TreeViewer newTreeViewer = new TreeViewer(tree);
+ return newTreeViewer;
+ }
- @Override
- public void requestActivation()
- {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
parentViewer = (TreeViewer) viewerPane.getViewer();
@@ -1229,22 +1072,18 @@
// This is the page for the list viewer
//
{
- final ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ConfigEditor.this)
- {
- @Override
- public Viewer createViewer(Composite composite)
- {
- return new ListViewer(composite);
- }
+ final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new ListViewer(composite);
+ }
- @Override
- public void requestActivation()
- {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
listViewer = (ListViewer) viewerPane.getViewer();
listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
@@ -1258,22 +1097,18 @@
// This is the page for the tree viewer
//
{
- final ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ConfigEditor.this)
- {
- @Override
- public Viewer createViewer(Composite composite)
- {
- return new TreeViewer(composite);
- }
+ final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
- @Override
- public void requestActivation()
- {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
treeViewer = (TreeViewer) viewerPane.getViewer();
treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
@@ -1289,22 +1124,18 @@
// This is the page for the table viewer.
//
{
- final ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ConfigEditor.this)
- {
- @Override
- public Viewer createViewer(Composite composite)
- {
- return new TableViewer(composite);
- }
+ final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TableViewer(composite);
+ }
- @Override
- public void requestActivation()
- {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
tableViewer = (TableViewer) viewerPane.getViewer();
@@ -1336,22 +1167,18 @@
// This is the page for the table tree viewer.
//
{
- final ViewerPane viewerPane =
- new ViewerPane(getSite().getPage(), ConfigEditor.this)
- {
- @Override
- public Viewer createViewer(Composite composite)
- {
- return new TreeViewer(composite);
- }
+ final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+ @Override
+ public Viewer createViewer(Composite composite) {
+ return new TreeViewer(composite);
+ }
- @Override
- public void requestActivation()
- {
- super.requestActivation();
- setCurrentViewerPane(this);
- }
- };
+ @Override
+ public void requestActivation() {
+ super.requestActivation();
+ setCurrentViewerPane(this);
+ }
+ };
viewerPane.createControl(getContainer());
treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();
@@ -1380,44 +1207,34 @@
setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
}
- getSite().getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- setActivePage(0);
- }
- });
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ setActivePage(0);
+ }
+ });
}
// Ensures that this editor will only display the page's tab
// area if there are more than one page
//
- getContainer().addControlListener
- (new ControlAdapter()
- {
- boolean guard = false;
+ getContainer().addControlListener(new ControlAdapter() {
+ boolean guard = false;
- @Override
- public void controlResized(ControlEvent event)
- {
- if (!guard)
- {
- guard = true;
- hideTabs();
- guard = false;
- }
+ @Override
+ public void controlResized(ControlEvent event) {
+ if (!guard) {
+ guard = true;
+ hideTabs();
+ guard = false;
}
- });
+ }
+ });
- getSite().getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- updateProblemIndication();
- }
- });
+ getSite().getShell().getDisplay().asyncExec(new Runnable() {
+ public void run() {
+ updateProblemIndication();
+ }
+ });
}
/**
@@ -1428,13 +1245,10 @@
*
* @generated
*/
- protected void hideTabs()
- {
- if (getPageCount() <= 1)
- {
+ protected void hideTabs() {
+ if (getPageCount() <= 1) {
setPageText(0, ""); //$NON-NLS-1$
- if (getContainer() instanceof CTabFolder)
- {
+ if (getContainer() instanceof CTabFolder) {
((CTabFolder) getContainer()).setTabHeight(1);
final Point point = getContainer().getSize();
getContainer().setSize(point.x, point.y + 6);
@@ -1450,13 +1264,10 @@
*
* @generated
*/
- protected void showTabs()
- {
- if (getPageCount() > 1)
- {
+ protected void showTabs() {
+ if (getPageCount() > 1) {
setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
- if (getContainer() instanceof CTabFolder)
- {
+ if (getContainer() instanceof CTabFolder) {
((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
final Point point = getContainer().getSize();
getContainer().setSize(point.x, point.y - 6);
@@ -1472,12 +1283,10 @@
* @generated
*/
@Override
- protected void pageChange(int pageIndex)
- {
+ protected void pageChange(int pageIndex) {
super.pageChange(pageIndex);
- if (contentOutlinePage != null)
- {
+ if (contentOutlinePage != null) {
handleContentOutlineSelection(contentOutlinePage.getSelection());
}
}
@@ -1490,22 +1299,14 @@
* @generated
*/
@Override
- public Object getAdapter(@SuppressWarnings("rawtypes") Class key)
- {
- if (key.equals(IContentOutlinePage.class))
- {
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class key) {
+ if (key.equals(IContentOutlinePage.class)) {
return showOutlineView() ? getContentOutlinePage() : null;
- }
- else if (key.equals(IPropertySheetPage.class))
- {
+ } else if (key.equals(IPropertySheetPage.class)) {
return getPropertySheetPage();
- }
- else if (key.equals(IGotoMarker.class))
- {
+ } else if (key.equals(IGotoMarker.class)) {
return this;
- }
- else
- {
+ } else {
return super.getAdapter(key);
}
}
@@ -1517,17 +1318,13 @@
*
* @generated
*/
- public IContentOutlinePage getContentOutlinePage()
- {
- if (contentOutlinePage == null)
- {
+ public IContentOutlinePage getContentOutlinePage() {
+ if (contentOutlinePage == null) {
// The content outline is just a tree.
//
- class MyContentOutlinePage extends ContentOutlinePage
- {
+ class MyContentOutlinePage extends ContentOutlinePage {
@Override
- public void createControl(Composite parent)
- {
+ public void createControl(Composite parent) {
super.createControl(parent);
contentOutlineViewer = getTreeViewer();
contentOutlineViewer.addSelectionChangedListener(this);
@@ -1542,8 +1339,7 @@
//
createContextMenuFor(contentOutlineViewer);
- if (!editingDomain.getResourceSet().getResources().isEmpty())
- {
+ if (!editingDomain.getResourceSet().getResources().isEmpty()) {
// Select the root object in the view.
//
contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet()
@@ -1553,15 +1349,13 @@
@Override
public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
- IStatusLineManager statusLineManager)
- {
+ IStatusLineManager statusLineManager) {
super.makeContributions(menuManager, toolBarManager, statusLineManager);
contentOutlineStatusLineManager = statusLineManager;
}
@Override
- public void setActionBars(IActionBars actionBars)
- {
+ public void setActionBars(IActionBars actionBars) {
super.setActionBars(actionBars);
getActionBarContributor().shareGlobalActions(this, actionBars);
}
@@ -1571,16 +1365,13 @@
// Listen to selection so that we can handle it is a special way.
//
- contentOutlinePage.addSelectionChangedListener
- (new ISelectionChangedListener()
- {
- // This ensures that we handle selections correctly.
- //
- public void selectionChanged(SelectionChangedEvent event)
- {
- handleContentOutlineSelection(event.getSelection());
- }
- });
+ contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
+ // This ensures that we handle selections correctly.
+ //
+ public void selectionChanged(SelectionChangedEvent event) {
+ handleContentOutlineSelection(event.getSelection());
+ }
+ });
}
return contentOutlinePage;
@@ -1593,25 +1384,20 @@
*
* @generated
*/
- public IPropertySheetPage getPropertySheetPage()
- {
- final PropertySheetPage propertySheetPage =
- new ExtendedPropertySheetPage(editingDomain)
- {
- @Override
- public void setSelectionToViewer(List<?> selection)
- {
- ConfigEditor.this.setSelectionToViewer(selection);
- ConfigEditor.this.setFocus();
- }
+ public IPropertySheetPage getPropertySheetPage() {
+ final PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
+ @Override
+ public void setSelectionToViewer(List<?> selection) {
+ ConfigEditor.this.setSelectionToViewer(selection);
+ ConfigEditor.this.setFocus();
+ }
- @Override
- public void setActionBars(IActionBars actionBars)
- {
- super.setActionBars(actionBars);
- getActionBarContributor().shareGlobalActions(this, actionBars);
- }
- };
+ @Override
+ public void setActionBars(IActionBars actionBars) {
+ super.setActionBars(actionBars);
+ getActionBarContributor().shareGlobalActions(this, actionBars);
+ }
+ };
propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
propertySheetPages.add(propertySheetPage);
@@ -1625,38 +1411,30 @@
*
* @generated
*/
- public void handleContentOutlineSelection(ISelection selection)
- {
- if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection)
- {
+ public void handleContentOutlineSelection(ISelection selection) {
+ if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
final Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
- if (selectedElements.hasNext())
- {
+ if (selectedElements.hasNext()) {
// Get the first selected element.
//
final Object selectedElement = selectedElements.next();
// If it's the selection viewer, then we want it to select the same selection as this selection.
//
- if (currentViewerPane.getViewer() == selectionViewer)
- {
+ if (currentViewerPane.getViewer() == selectionViewer) {
final ArrayList<Object> selectionList = new ArrayList<Object>();
selectionList.add(selectedElement);
- while (selectedElements.hasNext())
- {
+ while (selectedElements.hasNext()) {
selectionList.add(selectedElements.next());
}
// Set the selection to the widget.
//
selectionViewer.setSelection(new StructuredSelection(selectionList));
- }
- else
- {
+ } else {
// Set the input to the widget.
//
- if (currentViewerPane.getViewer().getInput() != selectedElement)
- {
+ if (currentViewerPane.getViewer().getInput() != selectedElement) {
currentViewerPane.getViewer().setInput(selectedElement);
currentViewerPane.setTitle(selectedElement);
}
@@ -1673,8 +1451,7 @@
* @generated
*/
@Override
- public boolean isDirty()
- {
+ public boolean isDirty() {
return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
}
@@ -1686,8 +1463,7 @@
* @generated
*/
@Override
- public void doSave(IProgressMonitor progressMonitor)
- {
+ public void doSave(IProgressMonitor progressMonitor) {
// Save only resources that have actually changed.
//
final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
@@ -1695,44 +1471,34 @@
// Do the work within an operation because this is a long running activity that modifies the workbench.
//
- final WorkspaceModifyOperation operation =
- new WorkspaceModifyOperation()
- {
- // This is the method that gets invoked when the operation runs.
+ final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+ // This is the method that gets invoked when the operation runs.
+ //
+ @Override
+ public void execute(IProgressMonitor monitor) {
+ // Save the resources to the file system.
//
- @Override
- public void execute(IProgressMonitor monitor)
- {
- // Save the resources to the file system.
- //
- boolean first = true;
- for (final Resource resource : editingDomain.getResourceSet().getResources())
- {
- if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
- && !editingDomain.isReadOnly(resource))
- {
- try
- {
- final long timeStamp = resource.getTimeStamp();
- resource.save(saveOptions);
- if (resource.getTimeStamp() != timeStamp)
- {
- savedResources.add(resource);
- }
+ boolean first = true;
+ for (final Resource resource : editingDomain.getResourceSet().getResources()) {
+ if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
+ && !editingDomain.isReadOnly(resource)) {
+ try {
+ final long timeStamp = resource.getTimeStamp();
+ resource.save(saveOptions);
+ if (resource.getTimeStamp() != timeStamp) {
+ savedResources.add(resource);
}
- catch (final Exception exception)
- {
- resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
- }
- first = false;
+ } catch (final Exception exception) {
+ resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
}
+ first = false;
}
}
- };
+ }
+ };
updateProblemIndication = false;
- try
- {
+ try {
// This runs the options, and shows progress.
//
new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
@@ -1741,8 +1507,7 @@
//
((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
firePropertyChange(IEditorPart.PROP_DIRTY);
- } catch (final Exception exception)
- {
+ } catch (final Exception exception) {
// Something went wrong that shouldn't.
//
ConfigEditorPlugin.INSTANCE.log(exception);
@@ -1759,20 +1524,16 @@
*
* @generated
*/
- protected boolean isPersisted(Resource resource)
- {
+ protected boolean isPersisted(Resource resource) {
boolean result = false;
- try
- {
+ try {
final InputStream stream = editingDomain.getResourceSet().getURIConverter()
.createInputStream(resource.getURI());
- if (stream != null)
- {
+ if (stream != null) {
result = true;
stream.close();
}
- } catch (final IOException e)
- {
+ } catch (final IOException e) {
// Ignore
}
return result;
@@ -1786,8 +1547,7 @@
* @generated
*/
@Override
- public boolean isSaveAsAllowed()
- {
+ public boolean isSaveAsAllowed() {
return true;
}
@@ -1799,16 +1559,13 @@
* @generated
*/
@Override
- public void doSaveAs()
- {
+ public void doSaveAs() {
final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
saveAsDialog.open();
final IPath path = saveAsDialog.getResult();
- if (path != null)
- {
+ if (path != null) {
final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
- if (file != null)
- {
+ if (file != null) {
doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
}
}
@@ -1820,15 +1577,12 @@
*
* @generated
*/
- protected void doSaveAs(URI uri, IEditorInput editorInput)
- {
+ protected void doSaveAs(URI uri, IEditorInput editorInput) {
editingDomain.getResourceSet().getResources().get(0).setURI(uri);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
- final IProgressMonitor progressMonitor =
- getActionBars().getStatusLineManager() != null ?
- getActionBars().getStatusLineManager().getProgressMonitor() :
- new NullProgressMonitor();
+ final IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+ ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
doSave(progressMonitor);
}
@@ -1838,11 +1592,9 @@
*
* @generated
*/
- public void gotoMarker(IMarker marker)
- {
+ public void gotoMarker(IMarker marker) {
final List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
- if (!targetObjects.isEmpty())
- {
+ if (!targetObjects.isEmpty()) {
setSelectionToViewer(targetObjects);
}
}
@@ -1855,8 +1607,7 @@
* @generated
*/
@Override
- public void init(IEditorSite site, IEditorInput editorInput)
- {
+ public void init(IEditorSite site, IEditorInput editorInput) {
setSite(site);
setInputWithNotify(editorInput);
setPartName(editorInput.getName());
@@ -1873,14 +1624,10 @@
* @generated
*/
@Override
- public void setFocus()
- {
- if (currentViewerPane != null)
- {
+ public void setFocus() {
+ if (currentViewerPane != null) {
currentViewerPane.setFocus();
- }
- else
- {
+ } else {
getControl(getActivePage()).setFocus();
}
}
@@ -1892,8 +1639,7 @@
*
* @generated
*/
- public void addSelectionChangedListener(ISelectionChangedListener listener)
- {
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.add(listener);
}
@@ -1904,8 +1650,7 @@
*
* @generated
*/
- public void removeSelectionChangedListener(ISelectionChangedListener listener)
- {
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
selectionChangedListeners.remove(listener);
}
@@ -1916,8 +1661,7 @@
*
* @generated
*/
- public ISelection getSelection()
- {
+ public ISelection getSelection() {
return editorSelection;
}
@@ -1929,12 +1673,10 @@
*
* @generated
*/
- public void setSelection(ISelection selection)
- {
+ public void setSelection(ISelection selection) {
editorSelection = selection;
- for (final ISelectionChangedListener listener : selectionChangedListeners)
- {
+ for (final ISelectionChangedListener listener : selectionChangedListeners) {
listener.selectionChanged(new SelectionChangedEvent(this, selection));
}
setStatusLineManager(selection);
@@ -1946,18 +1688,14 @@
*
* @generated
*/
- public void setStatusLineManager(ISelection selection)
- {
- final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
- contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+ public void setStatusLineManager(ISelection selection) {
+ final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+ ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
- if (statusLineManager != null)
- {
- if (selection instanceof IStructuredSelection)
- {
+ if (statusLineManager != null) {
+ if (selection instanceof IStructuredSelection) {
final Collection<?> collection = ((IStructuredSelection) selection).toList();
- switch (collection.size())
- {
+ switch (collection.size()) {
case 0: {
statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
break;
@@ -1974,9 +1712,7 @@
break;
}
}
- }
- else
- {
+ } else {
statusLineManager.setMessage(""); //$NON-NLS-1$
}
}
@@ -1989,8 +1725,7 @@
*
* @generated
*/
- private static String getString(String key)
- {
+ private static String getString(String key) {
return ConfigEditorPlugin.INSTANCE.getString(key);
}
@@ -2001,8 +1736,7 @@
*
* @generated
*/
- private static String getString(String key, Object s1)
- {
+ private static String getString(String key, Object s1) {
return ConfigEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });
}
@@ -2014,8 +1748,7 @@
*
* @generated
*/
- public void menuAboutToShow(IMenuManager menuManager)
- {
+ public void menuAboutToShow(IMenuManager menuManager) {
((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
}
@@ -2025,8 +1758,7 @@
*
* @generated
*/
- public EditingDomainActionBarContributor getActionBarContributor()
- {
+ public EditingDomainActionBarContributor getActionBarContributor() {
return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
}
@@ -2036,8 +1768,7 @@
*
* @generated
*/
- public IActionBars getActionBars()
- {
+ public IActionBars getActionBars() {
return getActionBarContributor().getActionBars();
}
@@ -2047,8 +1778,7 @@
*
* @generated
*/
- public AdapterFactory getAdapterFactory()
- {
+ public AdapterFactory getAdapterFactory() {
return adapterFactory;
}
@@ -2059,8 +1789,7 @@
* @generated
*/
@Override
- public void dispose()
- {
+ public void dispose() {
updateProblemIndication = false;
ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
@@ -2069,18 +1798,15 @@
adapterFactory.dispose();
- if (getActionBarContributor().getActiveEditor() == this)
- {
+ if (getActionBarContributor().getActiveEditor() == this) {
getActionBarContributor().setActiveEditor(null);
}
- for (final PropertySheetPage propertySheetPage : propertySheetPages)
- {
+ for (final PropertySheetPage propertySheetPage : propertySheetPages) {
propertySheetPage.dispose();
}
- if (contentOutlinePage != null)
- {
+ if (contentOutlinePage != null) {
contentOutlinePage.dispose();
}
@@ -2094,8 +1820,7 @@
*
* @generated
*/
- protected boolean showOutlineView()
- {
+ protected boolean showOutlineView() {
return true;
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java
index a22d80e..03ce814 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java
@@ -21,8 +21,7 @@
*
* @generated
*/
-public final class ConfigEditorPlugin extends EMFPlugin
-{
+public final class ConfigEditorPlugin extends EMFPlugin {
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -48,11 +47,9 @@
*
* @generated
*/
- public ConfigEditorPlugin()
- {
- super(new ResourceLocator[]
- {
- });
+ public ConfigEditorPlugin() {
+ super(new ResourceLocator[] {
+ });
}
/**
@@ -64,8 +61,7 @@
* @generated
*/
@Override
- public ResourceLocator getPluginResourceLocator()
- {
+ public ResourceLocator getPluginResourceLocator() {
return plugin;
}
@@ -77,8 +73,7 @@
* @return the singleton instance.
* @generated
*/
- public static Implementation getPlugin()
- {
+ public static Implementation getPlugin() {
return plugin;
}
@@ -89,8 +84,7 @@
*
* @generated
*/
- public static class Implementation extends EclipseUIPlugin
- {
+ public static class Implementation extends EclipseUIPlugin {
/**
* Creates an instance.
* <!-- begin-user-doc -->
@@ -98,8 +92,7 @@
*
* @generated
*/
- public Implementation()
- {
+ public Implementation() {
super();
// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java
index 445276b..ef9cd1f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java
@@ -73,8 +73,7 @@
*
* @generated
*/
-public class ConfigModelWizard extends Wizard implements INewWizard
-{
+public class ConfigModelWizard extends Wizard implements INewWizard {
/**
* The supported extensions for created files.
* <!-- begin-user-doc -->
@@ -82,8 +81,8 @@
*
* @generated
*/
- public static final List<String> FILE_EXTENSIONS =
- Collections.unmodifiableList(Arrays.asList(ConfigEditorPlugin.INSTANCE.getString(
+ public static final List<String> FILE_EXTENSIONS = Collections
+ .unmodifiableList(Arrays.asList(ConfigEditorPlugin.INSTANCE.getString(
"_UI_ConfigEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
/**
@@ -93,8 +92,8 @@
*
* @generated
*/
- public static final String FORMATTED_FILE_EXTENSIONS =
- ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ public static final String FORMATTED_FILE_EXTENSIONS = ConfigEditorPlugin.INSTANCE
+ .getString("_UI_ConfigEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
/**
* This caches an instance of the model package.
@@ -166,8 +165,7 @@
*
* @generated
*/
- public void init(IWorkbench workbench, IStructuredSelection selection)
- {
+ public void init(IWorkbench workbench, IStructuredSelection selection) {
this.workbench = workbench;
this.selection = selection;
setWindowTitle(ConfigEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
@@ -182,18 +180,13 @@
*
* @generated
*/
- protected Collection<String> getInitialObjectNames()
- {
- if (initialObjectNames == null)
- {
+ protected Collection<String> getInitialObjectNames() {
+ if (initialObjectNames == null) {
initialObjectNames = new ArrayList<String>();
- for (final EClassifier eClassifier : configPackage.getEClassifiers())
- {
- if (eClassifier instanceof EClass)
- {
+ for (final EClassifier eClassifier : configPackage.getEClassifiers()) {
+ if (eClassifier instanceof EClass) {
final EClass eClass = (EClass) eClassifier;
- if (!eClass.isAbstract())
- {
+ if (!eClass.isAbstract()) {
initialObjectNames.add(eClass.getName());
}
}
@@ -210,8 +203,7 @@
*
* @generated
*/
- protected EObject createInitialModel()
- {
+ protected EObject createInitialModel() {
final EClass eClass = (EClass) configPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
final EObject rootObject = configFactory.create(eClass);
return rootObject;
@@ -225,60 +217,49 @@
* @generated
*/
@Override
- public boolean performFinish()
- {
- try
- {
+ public boolean performFinish() {
+ try {
// Remember the file.
//
final IFile modelFile = getModelFile();
// Do the work within an operation.
//
- final WorkspaceModifyOperation operation =
- new WorkspaceModifyOperation()
- {
- @Override
- protected void execute(IProgressMonitor progressMonitor)
- {
- try
- {
- // Create a resource set
- //
- final ResourceSet resourceSet = new ResourceSetImpl();
+ final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+ @Override
+ protected void execute(IProgressMonitor progressMonitor) {
+ try {
+ // Create a resource set
+ //
+ final ResourceSet resourceSet = new ResourceSetImpl();
- // Get the URI of the model file.
- //
- final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+ // Get the URI of the model file.
+ //
+ final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
- // Create a resource for this file.
- //
- final Resource resource = resourceSet.createResource(fileURI);
+ // Create a resource for this file.
+ //
+ final Resource resource = resourceSet.createResource(fileURI);
- // Add the initial model object to the contents.
- //
- final EObject rootObject = createInitialModel();
- if (rootObject != null)
- {
- resource.getContents().add(rootObject);
- }
-
- // Save the contents of the resource to the file system.
- //
- final Map<Object, Object> options = new HashMap<Object, Object>();
- options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
- resource.save(options);
+ // Add the initial model object to the contents.
+ //
+ final EObject rootObject = createInitialModel();
+ if (rootObject != null) {
+ resource.getContents().add(rootObject);
}
- catch (final Exception exception)
- {
- ConfigEditorPlugin.INSTANCE.log(exception);
- }
- finally
- {
- progressMonitor.done();
- }
+
+ // Save the contents of the resource to the file system.
+ //
+ final Map<Object, Object> options = new HashMap<Object, Object>();
+ options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+ resource.save(options);
+ } catch (final Exception exception) {
+ ConfigEditorPlugin.INSTANCE.log(exception);
+ } finally {
+ progressMonitor.done();
}
- };
+ }
+ };
getContainer().run(false, false, operation);
@@ -287,36 +268,28 @@
final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
final IWorkbenchPage page = workbenchWindow.getActivePage();
final IWorkbenchPart activePart = page.getActivePart();
- if (activePart instanceof ISetSelectionTarget)
- {
+ if (activePart instanceof ISetSelectionTarget) {
final ISelection targetSelection = new StructuredSelection(modelFile);
- getShell().getDisplay().asyncExec
- (new Runnable()
- {
- public void run()
- {
- ((ISetSelectionTarget) activePart).selectReveal(targetSelection);
- }
- });
+ 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 (final PartInitException exception)
- {
+ try {
+ page.openEditor(new FileEditorInput(modelFile),
+ workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+ } catch (final PartInitException exception) {
MessageDialog.openError(workbenchWindow.getShell(),
ConfigEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
return false;
}
return true;
- } catch (final Exception exception)
- {
+ } catch (final Exception exception) {
ConfigEditorPlugin.INSTANCE.log(exception);
return false;
}
@@ -329,8 +302,7 @@
*
* @generated
*/
- public class ConfigModelWizardNewFileCreationPage extends WizardNewFileCreationPage
- {
+ public class ConfigModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
/**
* Pass in the selection.
* <!-- begin-user-doc -->
@@ -338,8 +310,7 @@
*
* @generated
*/
- public ConfigModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection)
- {
+ public ConfigModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
super(pageId, selection);
}
@@ -351,14 +322,12 @@
* @generated
*/
@Override
- protected boolean validatePage()
- {
- if (super.validatePage())
- {
+ protected boolean validatePage() {
+ if (super.validatePage()) {
final String extension = new Path(getFileName()).getFileExtension();
- if (extension == null || !FILE_EXTENSIONS.contains(extension))
- {
- final String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+ if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+ final String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" //$NON-NLS-1$
+ : "_WARN_FilenameExtension"; //$NON-NLS-1$
setErrorMessage(ConfigEditorPlugin.INSTANCE.getString(key,
new Object[] { FORMATTED_FILE_EXTENSIONS }));
return false;
@@ -374,8 +343,7 @@
*
* @generated
*/
- public IFile getModelFile()
- {
+ public IFile getModelFile() {
return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
}
}
@@ -387,8 +355,7 @@
*
* @generated
*/
- public class ConfigModelWizardInitialObjectCreationPage extends WizardPage
- {
+ public class ConfigModelWizardInitialObjectCreationPage extends WizardPage {
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -399,7 +366,7 @@
/**
* @generated
- * <!-- begin-user-doc -->
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*/
protected List<String> encodings;
@@ -419,8 +386,7 @@
*
* @generated
*/
- public ConfigModelWizardInitialObjectCreationPage(String pageId)
- {
+ public ConfigModelWizardInitialObjectCreationPage(String pageId) {
super(pageId);
}
@@ -430,8 +396,7 @@
*
* @generated
*/
- public void createControl(Composite parent)
- {
+ public void createControl(Composite parent) {
final Composite composite = new Composite(parent, SWT.NONE);
{
final GridLayout layout = new GridLayout();
@@ -463,13 +428,11 @@
initialObjectField.setLayoutData(data);
}
- for (final String objectName : getInitialObjectNames())
- {
+ for (final String objectName : getInitialObjectNames()) {
initialObjectField.add(getLabel(objectName));
}
- if (initialObjectField.getItemCount() == 1)
- {
+ if (initialObjectField.getItemCount() == 1) {
initialObjectField.select(0);
}
initialObjectField.addModifyListener(validator);
@@ -490,8 +453,7 @@
encodingField.setLayoutData(data);
}
- for (final String encoding : getEncodings())
- {
+ for (final String encoding : getEncodings()) {
encodingField.add(encoding);
}
@@ -508,14 +470,11 @@
*
* @generated
*/
- protected ModifyListener validator =
- new ModifyListener()
- {
- public void modifyText(ModifyEvent e)
- {
- setPageComplete(validatePage());
- }
- };
+ protected ModifyListener validator = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ setPageComplete(validatePage());
+ }
+ };
/**
* <!-- begin-user-doc -->
@@ -523,8 +482,7 @@
*
* @generated
*/
- protected boolean validatePage()
- {
+ protected boolean validatePage() {
return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
}
@@ -535,18 +493,13 @@
* @generated
*/
@Override
- public void setVisible(boolean visible)
- {
+ public void setVisible(boolean visible) {
super.setVisible(visible);
- if (visible)
- {
- if (initialObjectField.getItemCount() == 1)
- {
+ if (visible) {
+ if (initialObjectField.getItemCount() == 1) {
initialObjectField.clearSelection();
encodingField.setFocus();
- }
- else
- {
+ } else {
encodingField.clearSelection();
initialObjectField.setFocus();
}
@@ -559,14 +512,11 @@
*
* @generated
*/
- public String getInitialObjectName()
- {
+ public String getInitialObjectName() {
final String label = initialObjectField.getText();
- for (final String name : getInitialObjectNames())
- {
- if (getLabel(name).equals(label))
- {
+ for (final String name : getInitialObjectNames()) {
+ if (getLabel(name).equals(label)) {
return name;
}
}
@@ -579,8 +529,7 @@
*
* @generated
*/
- public String getEncoding()
- {
+ public String getEncoding() {
return encodingField.getText();
}
@@ -591,13 +540,10 @@
*
* @generated
*/
- protected String getLabel(String typeName)
- {
- try
- {
+ protected String getLabel(String typeName) {
+ try {
return ConfigEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
- } catch (final MissingResourceException mre)
- {
+ } catch (final MissingResourceException mre) {
ConfigEditorPlugin.INSTANCE.log(mre);
}
return typeName;
@@ -609,10 +555,8 @@
*
* @generated
*/
- protected Collection<String> getEncodings()
- {
- if (encodings == null)
- {
+ protected Collection<String> getEncodings() {
+ if (encodings == null) {
encodings = new ArrayList<String>();
for (final StringTokenizer stringTokenizer = new StringTokenizer(
ConfigEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$
@@ -632,38 +576,34 @@
* @generated
*/
@Override
- public void addPages()
- {
+ public void addPages() {
// Create a page, set the title, and the initial model file name.
//
newFileCreationPage = new ConfigModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
newFileCreationPage.setTitle(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigModelWizard_label")); //$NON-NLS-1$
newFileCreationPage.setDescription(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigModelWizard_description")); //$NON-NLS-1$
newFileCreationPage
- .setFileName(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+ .setFileName(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditorFilenameDefaultBase") + "." //$NON-NLS-1$ //$NON-NLS-2$
+ + 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())
- {
+ if (selection != null && !selection.isEmpty()) {
// Get the resource...
//
final Object selectedElement = selection.iterator().next();
- if (selectedElement instanceof IResource)
- {
+ if (selectedElement instanceof IResource) {
// Get the resource parent, if its a file.
//
IResource selectedResource = (IResource) selectedElement;
- if (selectedResource.getType() == IResource.FILE)
- {
+ if (selectedResource.getType() == IResource.FILE) {
selectedResource = selectedResource.getParent();
}
// This gives us a directory...
//
- if (selectedResource instanceof IFolder || selectedResource instanceof IProject)
- {
+ if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
// Set this for the container.
//
newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
@@ -674,8 +614,7 @@
.getString("_UI_ConfigEditorFilenameDefaultBase"); //$NON-NLS-1$
final String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
- for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i)
- {
+ for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
}
newFileCreationPage.setFileName(modelFilename);
@@ -696,8 +635,7 @@
*
* @generated
*/
- public IFile getModelFile()
- {
+ public IFile getModelFile() {
return newFileCreationPage.getModelFile();
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
index 0057cf3..b7f9383 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.example/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
index 9423279..e201c37 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
index 5b02e99..e39cafa 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
@@ -183,8 +183,7 @@
resource.load(null);
}
- final TestConfig internalConfig =
- ESTestConfigImpl.class.cast(config).toInternalAPI();
+ final TestConfig internalConfig = ESTestConfigImpl.class.cast(config).toInternalAPI();
if (!FuzzyUtil.containsConfig(resource, internalConfig)) {
resource.getContents().add(internalConfig);
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java
index ebb7349..21a6d4f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java
@@ -38,8 +38,8 @@
* @see com.google.common.base.Predicate#apply(java.lang.Object)
*/
public boolean apply(EObject root) {
- final Map<EObject, Collection<Setting>> externalCrossReferences =
- EcoreUtil.ExternalCrossReferencer.find(Collections.singleton(root));
+ final Map<EObject, Collection<Setting>> externalCrossReferences = EcoreUtil.ExternalCrossReferencer
+ .find(Collections.singleton(root));
final Resource rootResource = root.eResource();
final Set<EObject> externalEObjects = externalCrossReferences.keySet();
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
index 640fafa..4fd771a 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
@@ -199,8 +199,7 @@
resource.load(null);
}
- final TestConfig internalConfig =
- ESTestConfigImpl.class.cast(config).toInternalAPI();
+ final TestConfig internalConfig = ESTestConfigImpl.class.cast(config).toInternalAPI();
if (!FuzzyUtil.containsConfig(resource, internalConfig)) {
resource.getContents().add(internalConfig);
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java
index d3d5efc..1613c34 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java
@@ -106,7 +106,8 @@
firstBuildNumber = getLastValidBuildNumber(
Integer.parseInt(getFirstElementValue(jobUrl + LAST_BUILD
- + "/api/xml?tree=number")), jobUrl); //$NON-NLS-1$
+ + "/api/xml?tree=number")), //$NON-NLS-1$
+ jobUrl);
secondBuildNumber = getLastValidBuildNumber(firstBuildNumber - 1,
jobUrl);
}
@@ -175,7 +176,8 @@
} catch (final DocumentException ex) {
throw new DocumentException(
MessageFormat.format(
- Messages.HudsonTestRunProvider_ReadFailed, url), ex);
+ Messages.HudsonTestRunProvider_ReadFailed, url),
+ ex);
}
final List<Element> elements = doc.getRootElement().elements();
if (elements.size() == 0) {
@@ -254,7 +256,8 @@
+ "/"; //$NON-NLS-1$
final int lastValidNumber = getLastValidBuildNumber(
Integer.parseInt(getFirstElementValue(diffJobUrl + LAST_BUILD
- + "/api/xml?tree=number")), diffJobUrl); //$NON-NLS-1$
+ + "/api/xml?tree=number")), //$NON-NLS-1$
+ diffJobUrl);
return FuzzyUtil.createResource(diffJobUrl + lastValidNumber + ARTIFACT
+ FuzzyUtil.FUZZY_FOLDER + "diff" + FuzzyUtil.FILE_SUFFIX); //$NON-NLS-1$
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
index 94c261b..5bd5788 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
@@ -20,7 +20,8 @@
import org.junit.runners.model.TestClass;
/**
- * A Data Provider for the JUnit Runner: {@link org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner ESFuzzyRunner}.<br>
+ * A Data Provider for the JUnit Runner: {@link org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner ESFuzzyRunner}.
+ * <br>
* <br>
* An implementation of it must have a zero-parameter constructor.
*
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
index ffe33a6..19d702b 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
@@ -15,8 +15,6 @@
import java.io.PrintWriter;
import java.io.StringWriter;
-import junit.framework.AssertionFailedError;
-
import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigFactory;
@@ -27,6 +25,8 @@
import org.junit.runner.notification.Failure;
import org.junit.runner.notification.RunListener;
+import junit.framework.AssertionFailedError;
+
/**
* {@link RunListener} used to create the report of a run of the {@link ESEMFDataProvider}.
*
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java
index f5b4bc3..d64d772 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java
@@ -219,7 +219,8 @@
} catch (final IOException e) {
throw new RuntimeException(
MessageFormat.format(Messages.FuzzyUtil_LoadPropertiesFailed,
- file.getAbsolutePath()), e);
+ file.getAbsolutePath()),
+ e);
}
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java
index deedebe..8a5d99d 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java
@@ -32,41 +32,41 @@
ConfigFactory eINSTANCE = org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigFactoryImpl.init();
/**
- * Returns a new object of class '<em>ESFuzzyTest Config</em>'.
+ * Returns a new object of class '<em>Test Config</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return a new object of class '<em>ESFuzzyTest Config</em>'.
+ * @return a new object of class '<em>Test Config</em>'.
* @generated
*/
TestConfig createTestConfig();
/**
- * Returns a new object of class '<em>ESFuzzyTest Run</em>'.
+ * Returns a new object of class '<em>Test Run</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return a new object of class '<em>ESFuzzyTest Run</em>'.
+ * @return a new object of class '<em>Test Run</em>'.
* @generated
*/
TestRun createTestRun();
/**
- * Returns a new object of class '<em>ESFuzzyTest Result</em>'.
+ * Returns a new object of class '<em>Test Result</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return a new object of class '<em>ESFuzzyTest Result</em>'.
+ * @return a new object of class '<em>Test Result</em>'.
* @generated
*/
TestResult createTestResult();
/**
- * Returns a new object of class '<em>ESFuzzyTest Diff</em>'.
+ * Returns a new object of class '<em>Test Diff</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return a new object of class '<em>ESFuzzyTest Diff</em>'.
+ * @return a new object of class '<em>Test Diff</em>'.
* @generated
*/
TestDiff createTestDiff();
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java
index dfe96f6..29d3d59 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java
@@ -70,7 +70,7 @@
/**
* The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl
- * <em>ESFuzzyTest Config</em>}' class.
+ * <em>Test Config</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -101,7 +101,7 @@
int TEST_CONFIG__COUNT = 1;
/**
- * The feature id for the '<em><b>ESFuzzyTest Class</b></em>' attribute.
+ * The feature id for the '<em><b>Test Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -131,7 +131,7 @@
int TEST_CONFIG__MUTATOR_CONFIG = 4;
/**
- * The number of structural features of the '<em>ESFuzzyTest Config</em>' class.
+ * The number of structural features of the '<em>Test Config</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -142,7 +142,7 @@
/**
* The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl
- * <em>ESFuzzyTest Run</em>}' class.
+ * <em>Test Run</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -183,7 +183,7 @@
int TEST_RUN__RESULTS = 2;
/**
- * The number of structural features of the '<em>ESFuzzyTest Run</em>' class.
+ * The number of structural features of the '<em>Test Run</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -194,7 +194,7 @@
/**
* The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl
- * <em>ESFuzzyTest Result</em>}' class.
+ * <em>Test Result</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -215,7 +215,7 @@
int TEST_RESULT__SEED_COUNT = 0;
/**
- * The feature id for the '<em><b>ESFuzzyTest Name</b></em>' attribute.
+ * The feature id for the '<em><b>Test Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -255,7 +255,7 @@
int TEST_RESULT__EXECUTION_TIME = 4;
/**
- * The number of structural features of the '<em>ESFuzzyTest Result</em>' class.
+ * The number of structural features of the '<em>Test Result</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -266,7 +266,7 @@
/**
* The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl
- * <em>ESFuzzyTest Diff</em>}' class.
+ * <em>Test Diff</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -317,7 +317,7 @@
int TEST_DIFF__NEW_RESULT = 3;
/**
- * The number of structural features of the '<em>ESFuzzyTest Diff</em>' class.
+ * The number of structural features of the '<em>Test Diff</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -359,8 +359,8 @@
int DIFF_REPORT_FEATURE_COUNT = 1;
/**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl
- * <em>Root</em>}' class.
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl <em>Root</em>
+ * }' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -443,7 +443,7 @@
int MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT = 3;
/**
- * The feature id for the '<em><b>Use Ecore ESFuzzyUtil Delete</b></em>' attribute.
+ * The feature id for the '<em><b>Use Ecore Util Delete</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -524,11 +524,11 @@
/**
* Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig
- * <em>ESFuzzyTest Config</em>}'.
+ * <em>Test Config</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for class '<em>ESFuzzyTest Config</em>'.
+ * @return the meta object for class '<em>Test Config</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig
* @generated
*/
@@ -562,11 +562,11 @@
/**
* Returns the meta object for the attribute '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>ESFuzzyTest Class</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>Test Class</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for the attribute '<em>ESFuzzyTest Class</em>'.
+ * @return the meta object for the attribute '<em>Test Class</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass()
* @see #getTestConfig()
* @generated
@@ -601,11 +601,11 @@
/**
* Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
- * <em>ESFuzzyTest Run</em>}'.
+ * <em>Test Run</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for class '<em>ESFuzzyTest Run</em>'.
+ * @return the meta object for class '<em>Test Run</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
* @generated
*/
@@ -652,11 +652,11 @@
/**
* Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult
- * <em>ESFuzzyTest Result</em>}'.
+ * <em>Test Result</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for class '<em>ESFuzzyTest Result</em>'.
+ * @return the meta object for class '<em>Test Result</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult
* @generated
*/
@@ -677,11 +677,11 @@
/**
* Returns the meta object for the attribute '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>ESFuzzyTest Name</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>Test Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for the attribute '<em>ESFuzzyTest Name</em>'.
+ * @return the meta object for the attribute '<em>Test Name</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName()
* @see #getTestResult()
* @generated
@@ -729,11 +729,11 @@
/**
* Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
- * <em>ESFuzzyTest Diff</em>}'.
+ * <em>Test Diff</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for class '<em>ESFuzzyTest Diff</em>'.
+ * @return the meta object for class '<em>Test Diff</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
* @generated
*/
@@ -910,11 +910,11 @@
/**
* Returns the meta object for the attribute '
* {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete
- * <em>Use Ecore ESFuzzyUtil Delete</em>}'.
+ * <em>Use Ecore Util Delete</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @return the meta object for the attribute '<em>Use Ecore ESFuzzyUtil Delete</em>'.
+ * @return the meta object for the attribute '<em>Use Ecore Util Delete</em>'.
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete()
* @see #getMutatorConfig()
* @generated
@@ -1030,8 +1030,7 @@
interface Literals {
/**
* The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl <em>ESFuzzyTest Config</em>}'
- * class.
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl <em>Test Config</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1060,7 +1059,7 @@
EAttribute TEST_CONFIG__COUNT = eINSTANCE.getTestConfig_Count();
/**
- * The meta object literal for the '<em><b>ESFuzzyTest Class</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Test Class</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1088,7 +1087,7 @@
/**
* The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl
- * <em>ESFuzzyTest Run</em>}' class.
+ * <em>Test Run</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1127,8 +1126,7 @@
/**
* The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl <em>ESFuzzyTest Result</em>}'
- * class.
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl <em>Test Result</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1148,7 +1146,7 @@
EAttribute TEST_RESULT__SEED_COUNT = eINSTANCE.getTestResult_SeedCount();
/**
- * The meta object literal for the '<em><b>ESFuzzyTest Name</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Test Name</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1185,7 +1183,7 @@
/**
* The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl
- * <em>ESFuzzyTest Diff</em>}' class.
+ * <em>Test Diff</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -1323,7 +1321,7 @@
EAttribute MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT = eINSTANCE.getMutatorConfig_DoNotGenerateRoot();
/**
- * The meta object literal for the '<em><b>Use Ecore ESFuzzyUtil Delete</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Use Ecore Util Delete</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java
index 15dd666..895713a 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java
@@ -20,10 +20,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport#getDiffs <em>Diffs</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getDiffReport()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java
index 04e3a08..b1311f6 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java
@@ -27,31 +27,31 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getRootEClass <em>Root EClass
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount <em>Min
- * Objects Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isIgnoreAndLog <em>Ignore And
- * Log</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isDoNotGenerateRoot <em>Do Not
- * Generate Root</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete <em>Use
- * Ecore ESFuzzyUtil Delete</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEClassesToIgnore <em>EClasses
- * To Ignore</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getRootEClass
+ * <em>Root EClass</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount
+ * <em>Min Objects Count</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isIgnoreAndLog
+ * <em>Ignore And Log</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isDoNotGenerateRoot
+ * <em>Do Not Generate Root</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete
+ * <em>Use Ecore Util Delete</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEClassesToIgnore
+ * <em>EClasses To Ignore</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEStructuralFeaturesToIgnore
* <em>EStructural Features To Ignore</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEPackages <em>EPackages</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMaxDeleteCount <em>Max Delete
- * Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMutationCount <em>Mutation
- * Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isAllowDuplicateIDs <em>Allow
- * Duplicate IDs</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMaxDeleteCount
+ * <em>Max Delete Count</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMutationCount
+ * <em>Mutation Count</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isAllowDuplicateIDs
+ * <em>Allow Duplicate IDs</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig()
* @model
@@ -106,8 +106,7 @@
int getMinObjectsCount();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount
* <em>Min Objects Count</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -180,7 +179,7 @@
void setDoNotGenerateRoot(boolean value);
/**
- * Returns the value of the '<em><b>Use Ecore ESFuzzyUtil Delete</b></em>' attribute.
+ * Returns the value of the '<em><b>Use Ecore Util Delete</b></em>' attribute.
* The default value is <code>"false"</code>.
* <!-- begin-user-doc -->
* <p>
@@ -189,7 +188,7 @@
* </p>
* <!-- end-user-doc -->
*
- * @return the value of the '<em>Use Ecore ESFuzzyUtil Delete</em>' attribute.
+ * @return the value of the '<em>Use Ecore Util Delete</em>' attribute.
* @see #setUseEcoreUtilDelete(boolean)
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_UseEcoreUtilDelete()
* @model default="false"
@@ -200,11 +199,11 @@
/**
* Sets the value of the '
* {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete
- * <em>Use Ecore ESFuzzyUtil Delete</em>}' attribute.
+ * <em>Use Ecore Util Delete</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @param value the new value of the '<em>Use Ecore ESFuzzyUtil Delete</em>' attribute.
+ * @param value the new value of the '<em>Use Ecore Util Delete</em>' attribute.
* @see #isUseEcoreUtilDelete()
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java
index 1b73283..bad15b0 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java
@@ -20,10 +20,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root#getElements <em>Elements</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getRoot()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java
index 649677f..c731819 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java
@@ -23,16 +23,16 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed <em>Seed</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getCount <em>Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>ESFuzzyTest Class
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>Test Class</em>}
+ * </li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getMutatorConfig <em>Mutator Config
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getMutatorConfig
+ * <em>Mutator Config</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig()
* @model
@@ -56,8 +56,8 @@
long getSeed();
/**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed
- * <em>Seed</em>}' attribute.
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed <em>Seed</em>
+ * }' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -97,7 +97,7 @@
void setCount(int value);
/**
- * Returns the value of the '<em><b>ESFuzzyTest Class</b></em>' attribute.
+ * Returns the value of the '<em><b>Test Class</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>ESFuzzyTest Class</em>' attribute isn't clear, there really should be more of a
@@ -105,7 +105,7 @@
* </p>
* <!-- end-user-doc -->
*
- * @return the value of the '<em>ESFuzzyTest Class</em>' attribute.
+ * @return the value of the '<em>Test Class</em>' attribute.
* @see #setTestClass(Class)
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig_TestClass()
* @model
@@ -115,11 +115,11 @@
/**
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass
- * <em>ESFuzzyTest Class</em>}' attribute.
+ * <em>Test Class</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @param value the new value of the '<em>ESFuzzyTest Class</em>' attribute.
+ * @param value the new value of the '<em>Test Class</em>' attribute.
* @see #getTestClass()
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java
index 780e32c..fe5e1c7 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java
@@ -21,13 +21,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getLastUpdate <em>Last Update</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getConfig <em>Config</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getOldResult <em>Old Result</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getNewResult <em>New Result</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestDiff()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java
index 00f9d38..510a0bc 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java
@@ -19,14 +19,15 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getSeedCount <em>Seed Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>ESFuzzyTest Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>Test Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getError <em>Error</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getFailure <em>Failure</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getExecutionTime <em>Execution Time</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getExecutionTime <em>Execution Time</em>}
+ * </li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult()
* @model
@@ -63,7 +64,7 @@
void setSeedCount(int value);
/**
- * Returns the value of the '<em><b>ESFuzzyTest Name</b></em>' attribute.
+ * Returns the value of the '<em><b>Test Name</b></em>' attribute.
* <!-- begin-user-doc -->
* <p>
* If the meaning of the '<em>ESFuzzyTest Name</em>' attribute isn't clear, there really should be more of a
@@ -71,7 +72,7 @@
* </p>
* <!-- end-user-doc -->
*
- * @return the value of the '<em>ESFuzzyTest Name</em>' attribute.
+ * @return the value of the '<em>Test Name</em>' attribute.
* @see #setTestName(String)
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult_TestName()
* @model
@@ -81,11 +82,11 @@
/**
* Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName
- * <em>ESFuzzyTest Name</em>}' attribute.
+ * <em>Test Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
- * @param value the new value of the '<em>ESFuzzyTest Name</em>' attribute.
+ * @param value the new value of the '<em>Test Name</em>' attribute.
* @see #getTestName()
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java
index 295d501..c875bfe 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java
@@ -19,17 +19,16 @@
* <!-- begin-user-doc -->
* A representation of the model object '<em><b>ESFuzzyTest Run</b></em>'.
*
- * @extends APIDelegate<ESTestRunImpl>
- * <!-- end-user-doc -->
+ * <!-- end-user-doc -->
*
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getConfig <em>Config</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getTime <em>Time</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getResults <em>Results</em>}</li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getConfig <em>Config</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getTime <em>Time</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getResults <em>Results</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestRun()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java
index 7bad939..1f3572e 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java
@@ -120,8 +120,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link ConfigPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link ConfigPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -135,9 +136,9 @@
}
// Obtain or create and register package
- final ConfigPackageImpl theConfigPackage = (ConfigPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConfigPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new ConfigPackageImpl());
+ final ConfigPackageImpl theConfigPackage = (ConfigPackageImpl) (EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof ConfigPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new ConfigPackageImpl());
isInited = true;
@@ -637,158 +638,107 @@
// Add supertypes to classes
// Initialize classes and features; add operations and parameters
- initEClass(testConfigEClass, TestConfig.class,
- "TestConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTestConfig_Seed(),
- ecorePackage.getELong(),
- "seed", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestConfig_Count(),
- ecorePackage.getEInt(),
- "count", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(testConfigEClass, TestConfig.class, "TestConfig", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestConfig_Seed(), ecorePackage.getELong(), "seed", null, 0, 1, TestConfig.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestConfig_Count(), ecorePackage.getEInt(), "count", null, 0, 1, TestConfig.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
final EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
final EGenericType g2 = createEGenericType();
g1.getETypeArguments().add(g2);
- initEAttribute(
- getTestConfig_TestClass(),
- g1,
- "testClass", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestConfig_Id(),
- ecorePackage.getEString(),
- "id", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestConfig_MutatorConfig(),
- getMutatorConfig(),
- null,
- "mutatorConfig", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEAttribute(getTestConfig_TestClass(), g1, "testClass", null, 0, 1, TestConfig.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestConfig_Id(), ecorePackage.getEString(), "id", null, 0, 1, TestConfig.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestConfig_MutatorConfig(), getMutatorConfig(), null, "mutatorConfig", null, 0, 1, //$NON-NLS-1$
+ TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(testRunEClass, TestRun.class, "TestRun", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getTestRun_Config(),
- getTestConfig(),
- null,
- "config", null, 0, 1, TestRun.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestRun_Time(),
- ecorePackage.getEDate(),
- "time", null, 0, 1, TestRun.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestRun_Results(),
- getTestResult(),
- null,
- "results", null, 0, -1, TestRun.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getTestRun_Config(), getTestConfig(), null, "config", null, 0, 1, TestRun.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestRun_Time(), ecorePackage.getEDate(), "time", null, 0, 1, TestRun.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestRun_Results(), getTestResult(), null, "results", null, 0, -1, TestRun.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(testResultEClass, TestResult.class,
- "TestResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTestResult_SeedCount(),
- ecorePackage.getEInt(),
- "seedCount", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestResult_TestName(),
- ecorePackage.getEString(),
- "testName", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestResult_Error(),
- ecorePackage.getEString(),
- "error", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestResult_Failure(),
- ecorePackage.getEString(),
- "failure", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestResult_ExecutionTime(),
- ecorePackage.getELong(),
- "executionTime", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(testResultEClass, TestResult.class, "TestResult", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestResult_SeedCount(), ecorePackage.getEInt(), "seedCount", null, 0, 1, TestResult.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestResult_TestName(), ecorePackage.getEString(), "testName", null, 0, 1, TestResult.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestResult_Error(), ecorePackage.getEString(), "error", null, 0, 1, TestResult.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestResult_Failure(), ecorePackage.getEString(), "failure", null, 0, 1, TestResult.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestResult_ExecutionTime(), ecorePackage.getELong(), "executionTime", null, 0, 1, //$NON-NLS-1$
+ TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(testDiffEClass, TestDiff.class, "TestDiff", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTestDiff_LastUpdate(),
- ecorePackage.getEDate(),
- "lastUpdate", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestDiff_Config(),
- getTestConfig(),
- null,
- "config", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestDiff_OldResult(),
- getTestResult(),
- null,
- "oldResult", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestDiff_NewResult(),
- getTestResult(),
- null,
- "newResult", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(testDiffEClass, TestDiff.class, "TestDiff", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestDiff_LastUpdate(), ecorePackage.getEDate(), "lastUpdate", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestDiff_Config(), getTestConfig(), null, "config", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestDiff_OldResult(), getTestResult(), null, "oldResult", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestDiff_NewResult(), getTestResult(), null, "newResult", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(diffReportEClass, DiffReport.class,
- "DiffReport", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getDiffReport_Diffs(),
- getTestDiff(),
- null,
- "diffs", null, 0, -1, DiffReport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEClass(diffReportEClass, DiffReport.class, "DiffReport", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getDiffReport_Diffs(), getTestDiff(), null, "diffs", null, 0, -1, DiffReport.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getRoot_Elements(),
- ecorePackage.getEObject(),
- null,
- "elements", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+ initEReference(getRoot_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, Root.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
- initEClass(mutatorConfigEClass, MutatorConfig.class,
- "MutatorConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getMutatorConfig_RootEClass(),
- ecorePackage.getEClass(),
- null,
- "rootEClass", null, 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getMutatorConfig_MinObjectsCount(),
- ecorePackage.getEInt(),
- "minObjectsCount", "100", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(
- getMutatorConfig_IgnoreAndLog(),
- ecorePackage.getEBoolean(),
- "ignoreAndLog", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(
- getMutatorConfig_DoNotGenerateRoot(),
- ecorePackage.getEBoolean(),
- "doNotGenerateRoot", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(
- getMutatorConfig_UseEcoreUtilDelete(),
- ecorePackage.getEBoolean(),
- "useEcoreUtilDelete", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEReference(
- getMutatorConfig_EClassesToIgnore(),
- ecorePackage.getEClass(),
- null,
- "eClassesToIgnore", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getMutatorConfig_EStructuralFeaturesToIgnore(),
- ecorePackage.getEStructuralFeature(),
- null,
- "eStructuralFeaturesToIgnore", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getMutatorConfig_EPackages(),
- ecorePackage.getEPackage(),
- null,
- "ePackages", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getMutatorConfig_MaxDeleteCount(),
- ecorePackage.getEIntegerObject(),
- "maxDeleteCount", null, 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getMutatorConfig_MutationCount(),
- ecorePackage.getEInt(),
- "mutationCount", "-1", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
- initEAttribute(
- getMutatorConfig_AllowDuplicateIDs(),
- ecorePackage.getEBoolean(),
- "allowDuplicateIDs", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+ initEClass(mutatorConfigEClass, MutatorConfig.class, "MutatorConfig", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getMutatorConfig_RootEClass(), ecorePackage.getEClass(), null, "rootEClass", null, 0, 1, //$NON-NLS-1$
+ MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_MinObjectsCount(), ecorePackage.getEInt(), "minObjectsCount", "100", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+ MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_IgnoreAndLog(), ecorePackage.getEBoolean(), "ignoreAndLog", "false", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+ MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_DoNotGenerateRoot(), ecorePackage.getEBoolean(), "doNotGenerateRoot", "false", //$NON-NLS-1$//$NON-NLS-2$
+ 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_UseEcoreUtilDelete(), ecorePackage.getEBoolean(), "useEcoreUtilDelete", "false", //$NON-NLS-1$//$NON-NLS-2$
+ 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getMutatorConfig_EClassesToIgnore(), ecorePackage.getEClass(), null, "eClassesToIgnore", null, 0, //$NON-NLS-1$
+ -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMutatorConfig_EStructuralFeaturesToIgnore(), ecorePackage.getEStructuralFeature(), null,
+ "eStructuralFeaturesToIgnore", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMutatorConfig_EPackages(), ecorePackage.getEPackage(), null, "ePackages", null, 0, -1, //$NON-NLS-1$
+ MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_MaxDeleteCount(), ecorePackage.getEIntegerObject(), "maxDeleteCount", null, 0, //$NON-NLS-1$
+ 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_MutationCount(), ecorePackage.getEInt(), "mutationCount", "-1", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+ MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMutatorConfig_AllowDuplicateIDs(), ecorePackage.getEBoolean(), "allowDuplicateIDs", "false", //$NON-NLS-1$//$NON-NLS-2$
+ 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
// Create resource
createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java
index 2cbe109..bd0d570 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java
@@ -29,10 +29,10 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.DiffReportImpl#getDiffs <em>Diffs</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java
index 0f6b383..2836474 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java
@@ -28,34 +28,38 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Mutator Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getRootEClass <em>Root EClass
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMinObjectsCount <em>Min
- * Objects Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isIgnoreAndLog <em>Ignore And
- * Log</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isDoNotGenerateRoot <em>Do Not
- * Generate Root</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isUseEcoreUtilDelete <em>Use
- * Ecore ESFuzzyUtil Delete</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEClassesToIgnore <em>EClasses
- * To Ignore</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEStructuralFeaturesToIgnore
- * <em>EStructural Features To Ignore</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEPackages <em>EPackages</em>}
- * </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMaxDeleteCount <em>Max Delete
- * Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMutationCount <em>Mutation
- * Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isAllowDuplicateIDs <em>Allow
- * Duplicate IDs</em>}</li>
- * </ul>
- * </p>
+ *
+ * @extends AbstractAPIDeletegateImpl<ESMutatorConfigImpl, MutatorConfig>
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getRootEClass
+ * <em>Root EClass</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMinObjectsCount
+ * <em>Min Objects Count</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isIgnoreAndLog
+ * <em>Ignore And Log</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isDoNotGenerateRoot
+ * <em>Do Not Generate Root</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isUseEcoreUtilDelete
+ * <em>Use Ecore Util Delete</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEClassesToIgnore
+ * <em>EClasses To Ignore</em>}</li>
+ * <li>
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEStructuralFeaturesToIgnore
+ * <em>EStructural Features To Ignore</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEPackages
+ * <em>EPackages</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMaxDeleteCount
+ * <em>Max Delete Count</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMutationCount
+ * <em>Mutation Count</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isAllowDuplicateIDs
+ * <em>Allow Duplicate IDs</em>}</li>
+ * </ul>
*
* @generated
*/
@@ -140,7 +144,7 @@
protected boolean doNotGenerateRoot = DO_NOT_GENERATE_ROOT_EDEFAULT;
/**
- * The default value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore ESFuzzyUtil Delete</em>}' attribute.
+ * The default value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore Util Delete</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -151,7 +155,7 @@
protected static final boolean USE_ECORE_UTIL_DELETE_EDEFAULT = false;
/**
- * The cached value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore ESFuzzyUtil Delete</em>}' attribute.
+ * The cached value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore Util Delete</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -294,8 +298,8 @@
rootEClass = (EClass) eResolveProxy(oldRootEClass);
if (rootEClass != oldRootEClass) {
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- ConfigPackage.MUTATOR_CONFIG__ROOT_ECLASS, oldRootEClass, rootEClass));
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigPackage.MUTATOR_CONFIG__ROOT_ECLASS,
+ oldRootEClass, rootEClass));
}
}
}
@@ -704,8 +708,8 @@
case ConfigPackage.MUTATOR_CONFIG__EPACKAGES:
return ePackages != null && !ePackages.isEmpty();
case ConfigPackage.MUTATOR_CONFIG__MAX_DELETE_COUNT:
- return MAX_DELETE_COUNT_EDEFAULT == null ? maxDeleteCount != null : !MAX_DELETE_COUNT_EDEFAULT
- .equals(maxDeleteCount);
+ return MAX_DELETE_COUNT_EDEFAULT == null ? maxDeleteCount != null
+ : !MAX_DELETE_COUNT_EDEFAULT.equals(maxDeleteCount);
case ConfigPackage.MUTATOR_CONFIG__MUTATION_COUNT:
return mutationCount != MUTATION_COUNT_EDEFAULT;
case ConfigPackage.MUTATOR_CONFIG__ALLOW_DUPLICATE_IDS:
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java
index 2cfb63b..6afdd1c 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java
@@ -29,10 +29,10 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl#getElements <em>Elements</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java
index 57926e0..871d33e 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java
@@ -24,19 +24,23 @@
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>ESFuzzyTest Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getSeed <em>Seed</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getCount <em>Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getTestClass <em>ESFuzzyTest Class
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getMutatorConfig <em>Mutator Config
- * </em>}</li>
- * </ul>
- * </p>
+ *
+ * @extends AbstractAPIDeletegateImpl<ESTestConfigImpl, TestConfig>
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getSeed <em>Seed</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getCount <em>Count</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getTestClass
+ * <em>Test Class</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getMutatorConfig
+ * <em>Mutator Config</em>}</li>
+ * </ul>
*
* @generated
*/
@@ -87,7 +91,7 @@
protected int count = COUNT_EDEFAULT;
/**
- * The cached value of the '{@link #getTestClass() <em>ESFuzzyTest Class</em>}' attribute.
+ * The cached value of the '{@link #getTestClass() <em>Test Class</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -289,19 +293,18 @@
if (newMutatorConfig != mutatorConfig) {
NotificationChain msgs = null;
if (mutatorConfig != null) {
- msgs = ((InternalEObject) mutatorConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
+ msgs = ((InternalEObject) mutatorConfig).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
}
if (newMutatorConfig != null) {
- msgs = ((InternalEObject) newMutatorConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
+ msgs = ((InternalEObject) newMutatorConfig).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
}
msgs = basicSetMutatorConfig(newMutatorConfig, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG,
newMutatorConfig, newMutatorConfig));
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java
index d3a999d..ce1c7e2 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java
@@ -29,13 +29,16 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getLastUpdate <em>Last Update</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getConfig <em>Config</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getOldResult <em>Old Result</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getNewResult <em>New Result</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getLastUpdate <em>Last Update</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getConfig <em>Config</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getOldResult <em>Old Result</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getNewResult <em>New Result</em>}
+ * </li>
+ * </ul>
*
* @generated
*/
@@ -226,19 +229,18 @@
if (newOldResult != oldResult) {
NotificationChain msgs = null;
if (oldResult != null) {
- msgs = ((InternalEObject) oldResult).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
+ msgs = ((InternalEObject) oldResult).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
}
if (newOldResult != null) {
- msgs = ((InternalEObject) newOldResult).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
+ msgs = ((InternalEObject) newOldResult).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
}
msgs = basicSetOldResult(newOldResult, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_DIFF__OLD_RESULT, newOldResult,
newOldResult));
}
@@ -285,19 +287,18 @@
if (newNewResult != newResult) {
NotificationChain msgs = null;
if (newResult != null) {
- msgs = ((InternalEObject) newResult).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
+ msgs = ((InternalEObject) newResult).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
}
if (newNewResult != null) {
- msgs = ((InternalEObject) newNewResult).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
+ msgs = ((InternalEObject) newNewResult).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
}
msgs = basicSetNewResult(newNewResult, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
+ } else if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_DIFF__NEW_RESULT, newNewResult,
newNewResult));
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java
index 7e513e6..c9ab580 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java
@@ -23,16 +23,17 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getSeedCount <em>Seed Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getTestName <em>ESFuzzyTest Name
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getSeedCount <em>Seed Count</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getTestName <em>Test Name</em>}
+ * </li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getError <em>Error</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getFailure <em>Failure</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getExecutionTime <em>Execution Time
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getExecutionTime
+ * <em>Execution Time</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -60,7 +61,7 @@
protected int seedCount = SEED_COUNT_EDEFAULT;
/**
- * The default value of the '{@link #getTestName() <em>ESFuzzyTest Name</em>}' attribute.
+ * The default value of the '{@link #getTestName() <em>Test Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -71,7 +72,7 @@
protected static final String TEST_NAME_EDEFAULT = null;
/**
- * The cached value of the '{@link #getTestName() <em>ESFuzzyTest Name</em>}' attribute.
+ * The cached value of the '{@link #getTestName() <em>Test Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -262,8 +263,8 @@
final String oldFailure = failure;
failure = newFailure;
if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__FAILURE, oldFailure,
- failure));
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__FAILURE, oldFailure, failure));
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java
index 368850e..f282062 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java
@@ -33,12 +33,12 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl#getConfig <em>Config</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl#getTime <em>Time</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl#getResults <em>Results</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -149,20 +149,20 @@
if (newConfig != config) {
NotificationChain msgs = null;
if (config != null) {
- msgs = ((InternalEObject) config).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_RUN__CONFIG, null, msgs);
+ msgs = ((InternalEObject) config).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_RUN__CONFIG, null, msgs);
}
if (newConfig != null) {
- msgs = ((InternalEObject) newConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - ConfigPackage.TEST_RUN__CONFIG, null, msgs);
+ msgs = ((InternalEObject) newConfig).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_RUN__CONFIG, null, msgs);
}
msgs = basicSetConfig(newConfig, msgs);
if (msgs != null) {
msgs.dispatch();
}
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RUN__CONFIG, newConfig, newConfig));
+ } else if (eNotificationRequired()) {
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RUN__CONFIG, newConfig, newConfig));
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java
index 8d46ace..4da141e 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java
@@ -83,48 +83,47 @@
*
* @generated
*/
- protected ConfigSwitch<Adapter> modelSwitch =
- new ConfigSwitch<Adapter>() {
- @Override
- public Adapter caseTestConfig(TestConfig object) {
- return createTestConfigAdapter();
- }
+ protected ConfigSwitch<Adapter> modelSwitch = new ConfigSwitch<Adapter>() {
+ @Override
+ public Adapter caseTestConfig(TestConfig object) {
+ return createTestConfigAdapter();
+ }
- @Override
- public Adapter caseTestRun(TestRun object) {
- return createTestRunAdapter();
- }
+ @Override
+ public Adapter caseTestRun(TestRun object) {
+ return createTestRunAdapter();
+ }
- @Override
- public Adapter caseTestResult(TestResult object) {
- return createTestResultAdapter();
- }
+ @Override
+ public Adapter caseTestResult(TestResult object) {
+ return createTestResultAdapter();
+ }
- @Override
- public Adapter caseTestDiff(TestDiff object) {
- return createTestDiffAdapter();
- }
+ @Override
+ public Adapter caseTestDiff(TestDiff object) {
+ return createTestDiffAdapter();
+ }
- @Override
- public Adapter caseDiffReport(DiffReport object) {
- return createDiffReportAdapter();
- }
+ @Override
+ public Adapter caseDiffReport(DiffReport object) {
+ return createDiffReportAdapter();
+ }
- @Override
- public Adapter caseRoot(Root object) {
- return createRootAdapter();
- }
+ @Override
+ public Adapter caseRoot(Root object) {
+ return createRootAdapter();
+ }
- @Override
- public Adapter caseMutatorConfig(MutatorConfig object) {
- return createMutatorConfigAdapter();
- }
+ @Override
+ public Adapter caseMutatorConfig(MutatorConfig object) {
+ return createMutatorConfigAdapter();
+ }
- @Override
- public Adapter defaultCase(EObject object) {
- return createEObjectAdapter();
- }
- };
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
/**
* Creates an adapter for the <code>target</code>.
@@ -142,7 +141,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig <em>ESFuzzyTest Config</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig <em>Test Config</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -158,7 +157,7 @@
/**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
- * <em>ESFuzzyTest Run</em>}'.
+ * <em>Test Run</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -174,7 +173,7 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult <em>ESFuzzyTest Result</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult <em>Test Result</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
@@ -190,7 +189,7 @@
/**
* Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
- * <em>ESFuzzyTest Diff</em>}'.
+ * <em>Test Diff</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java
index f6759fe..4897360 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java
@@ -87,9 +87,7 @@
return doSwitch(theEClass.getClassifierID(), theEObject);
}
final List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
}
/**
@@ -165,14 +163,14 @@
}
/**
- * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Config</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Test Config</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
*
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Config</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Test Config</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -181,14 +179,14 @@
}
/**
- * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Run</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Test Run</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
*
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Run</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Test Run</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -197,14 +195,14 @@
}
/**
- * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Result</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Test Result</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
*
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Result</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Test Result</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -213,14 +211,14 @@
}
/**
- * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Diff</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Test Diff</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
*
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Diff</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Test Diff</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.migration.edapt/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
index 72f4556..d484999 100644
--- a/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.migration.edapt/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Edapt Migration
Bundle-SymbolicName: org.eclipse.emf.emfstore.migration.edapt;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.emfstore.migration;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.migration;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.common;bundle-version="[2.5.0,3.0.0)",
org.eclipse.emf.edapt.migration;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.edapt.history;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)"
Export-Package: org.eclipse.emf.emfstore.internal.migration.edapt;vers
- ion="1.8.1";x-internal:=true
+ ion="1.9.0";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml b/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
index b83583f..dcdc972 100644
--- a/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.migration.edapt/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.migration.edapt</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.migration/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
index 49e9aa5..eda95fe 100644
--- a/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.migration/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Migration
Bundle-SymbolicName: org.eclipse.emf.emfstore.migration;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.emf.emfstore.internal.migration;version="1
- .8.1"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.
+ .9.0"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.
emfstore.server, org.eclipse.emf.emfstore.migration.edapt";uses:="or
g.eclipse.core.runtime"
diff --git a/bundles/org.eclipse.emf.emfstore.migration/pom.xml b/bundles/org.eclipse.emf.emfstore.migration/pom.xml
index 53faef0..3961ad3 100644
--- a/bundles/org.eclipse.emf.emfstore.migration/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.migration/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.migration</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml b/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
index ece2ad3..751cd69 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java
index 36ff49b..82dd916 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java
@@ -126,16 +126,15 @@
final EAttribute eAttribute = (EAttribute) getTargetContainerSelector().getTargetFeature();
Object newValue = createNewValue(eAttribute);
- if (newValue != null && eAttribute.isID() && !getUtil().getModelMutatorConfiguration().isAllowDuplicateIDs())
- {
+ if (newValue != null && eAttribute.isID() && !getUtil().getModelMutatorConfiguration().isAllowDuplicateIDs()) {
while (!getUtil().isUniqueID(newValue)) {
newValue = createNewValue(eAttribute);
}
getUtil().registerID(newValue);
}
if (eAttribute.isMany()) {
- final int insertionIndex = getTargetContainerSelector().
- getRandomIndexFromTargetObjectAndFeatureValueRange();
+ final int insertionIndex = getTargetContainerSelector()
+ .getRandomIndexFromTargetObjectAndFeatureValueRange();
getUtil().setPerCommand(eObject, eAttribute, newValue, insertionIndex);
} else {
getUtil().setPerCommand(eObject, eAttribute, newValue);
@@ -151,8 +150,7 @@
if (eAttribute.isMany()) {
final List<?> currentValues = (List<?>) eObject.eGet(eAttribute);
- final int deletionIndex = getTargetContainerSelector().
- getRandomIndexFromTargetObjectAndFeatureValueRange();
+ final int deletionIndex = getTargetContainerSelector().getRandomIndexFromTargetObjectAndFeatureValueRange();
currentValues.remove(deletionIndex);
getUtil().setPerCommand(eObject, eAttribute, currentValues);
} else {
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java
index 2136fe2..7fe996c 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java
@@ -122,7 +122,7 @@
final FeatureMapEntryImpl featureMapEntry = FeatureMapEntryImpl.class.cast(entry);
featureMapEntry.setReferenceValue(
createOfType(
- EReference.class.cast(featureMapEntry.getEStructuralFeature()).getEReferenceType()));
+ EReference.class.cast(featureMapEntry.getEStructuralFeature()).getEReferenceType()));
}
} else if (ContainmentUpdatingFeatureMapEntry.class.isInstance(entry)) {
// TODO
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java
index 2b41268..7e2aeac 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java
@@ -46,7 +46,8 @@
* @author Philip Langer
*
*/
-public class MoveObjectMutation extends ContainmentChangeMutation<ESMoveObjectMutation> implements ESMoveObjectMutation {
+public class MoveObjectMutation extends ContainmentChangeMutation<ESMoveObjectMutation>
+ implements ESMoveObjectMutation {
private final MutationTargetSelector sourceContainerSelector;
private EObject eObjectToMove;
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java
index 7f9056b..524f2be 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java
@@ -52,123 +52,112 @@
/**
* Predicate specifying whether an {@link EStructuralFeature} is a {@link EReference}.
*/
- public static final Predicate<? super EStructuralFeature> IS_REFERENCE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return input != null && input instanceof EReference;
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_REFERENCE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return input != null && input instanceof EReference;
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is a containment {@link EReference}.
*/
- public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_REFERENCE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return IS_REFERENCE.apply(input)
- && ((EReference) input).isContainment();
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return IS_REFERENCE.apply(input)
+ && ((EReference) input).isContainment();
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is a containment {@link EReference} or the opposite of
* a containment {@link EReference}.
*/
- public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_OR_OPPOSITE_OF_CONTAINMENT_REFERENCE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return IS_CONTAINMENT_REFERENCE.apply(input) || IS_OPPOSITE_OF_CONTAINMENT_REFERENCE.apply(input);
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_OR_OPPOSITE_OF_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return IS_CONTAINMENT_REFERENCE.apply(input) || IS_OPPOSITE_OF_CONTAINMENT_REFERENCE.apply(input);
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is the opposite of a containment {@link EReference}.
*/
- public static final Predicate<? super EStructuralFeature> IS_OPPOSITE_OF_CONTAINMENT_REFERENCE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return input != null
- && input instanceof EReference
- && ((EReference) input).getEOpposite() != null
- && ((EReference) input).getEOpposite().isContainment();
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_OPPOSITE_OF_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return input != null
+ && input instanceof EReference
+ && ((EReference) input).getEOpposite() != null
+ && ((EReference) input).getEOpposite().isContainment();
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is a mutable containment {@link EReference}.
*/
- public static final Predicate<? super EStructuralFeature> IS_MUTABLE_CONTAINMENT_REFERENCE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return IS_MUTABLE.apply(input)
- && IS_CONTAINMENT_REFERENCE.apply(input);
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_MUTABLE_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return IS_MUTABLE.apply(input)
+ && IS_CONTAINMENT_REFERENCE.apply(input);
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is mutable.
*/
- public static final Predicate<? super EStructuralFeature> IS_MUTABLE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return input != null && input.isChangeable();
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_MUTABLE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return input != null && input.isChangeable();
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is multi-valued.
*/
- public static final Predicate<? super EStructuralFeature> IS_MULTI_VALUED =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return input != null && input.isMany();
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_MULTI_VALUED = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return input != null && input.isMany();
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is a mutable {@link EAttribute}.
*/
- public static final Predicate<? super EStructuralFeature> IS_MUTABLE_ATTRIBUTE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return IS_MUTABLE.apply(input) && input instanceof EAttribute;
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_MUTABLE_ATTRIBUTE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return IS_MUTABLE.apply(input) && input instanceof EAttribute;
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is a mutable {@link EReference}.
*/
- public static final Predicate<? super EStructuralFeature> IS_MUTABLE_REFERENCE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return IS_MUTABLE.apply(input) && input instanceof EReference;
- }
- };
+ public static final Predicate<? super EStructuralFeature> IS_MUTABLE_REFERENCE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return IS_MUTABLE.apply(input) && input instanceof EReference;
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is of type
* {@link org.eclipse.emf.ecore.change.FeatureMapEntry FeatureMapEntry}.
*/
- public static final Predicate<? super EStructuralFeature> HAS_FEATURE_MAP_ENTRY_TYPE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return input != null
- && EcorePackage.eINSTANCE.getEFeatureMapEntry().equals(input.getEType());
- }
- };
+ public static final Predicate<? super EStructuralFeature> HAS_FEATURE_MAP_ENTRY_TYPE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return input != null
+ && EcorePackage.eINSTANCE.getEFeatureMapEntry().equals(input.getEType());
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} is the feature map attribute of a feature map group.
*/
- public static final Predicate<? super EStructuralFeature> HAS_GROUP_FEATURE_MAP_ENTRY_TYPE =
- new Predicate<EStructuralFeature>() {
- public boolean apply(EStructuralFeature input) {
- return HAS_FEATURE_MAP_ENTRY_TYPE.apply(input)
- && input.getEAnnotation(EXTENDED_META_DATA) != null
- && input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND) != null
- && input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND).equals(GROUP);
- }
- };
+ public static final Predicate<? super EStructuralFeature> HAS_GROUP_FEATURE_MAP_ENTRY_TYPE = new Predicate<EStructuralFeature>() {
+ public boolean apply(EStructuralFeature input) {
+ return HAS_FEATURE_MAP_ENTRY_TYPE.apply(input)
+ && input.getEAnnotation(EXTENDED_META_DATA) != null
+ && input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND) != null
+ && input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND).equals(GROUP);
+ }
+ };
/**
* Predicate specifying whether an {@link EStructuralFeature} may take the given {@code eObject} as value.
@@ -199,7 +188,7 @@
public boolean apply(EStructuralFeature input) {
return input != null &&
(input.getEType() == feature.getEType()
- || isSubTypeOf(input.getEType(), feature.getEType()));
+ || isSubTypeOf(input.getEType(), feature.getEType()));
}
};
}
@@ -333,12 +322,11 @@
/**
* Predicate specifying whether an {@link Object} is not <code>null</code> or an empty list.
*/
- public static final Predicate<? super Object> IS_NON_EMPTY_VALUE_OR_LIST =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return !(input == null || isEmptyList(input));
- }
- };
+ public static final Predicate<? super Object> IS_NON_EMPTY_VALUE_OR_LIST = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return !(input == null || isEmptyList(input));
+ }
+ };
private static boolean isEmptyList(Object input) {
if (input instanceof List<?>) {
@@ -351,44 +339,40 @@
/**
* Predicate specifying whether an {@link Object} is a feature map containing at least one value.
*/
- public static final Predicate<? super Object> IS_NON_EMPTY_FEATURE_MAP =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return input != null && input instanceof FeatureMap && ((FeatureMap) input).size() > 0;
- }
- };
+ public static final Predicate<? super Object> IS_NON_EMPTY_FEATURE_MAP = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return input != null && input instanceof FeatureMap && ((FeatureMap) input).size() > 0;
+ }
+ };
/**
* Predicate specifying whether an {@link Object} is an {@link EObject} or a list of {@link EObject EObjects}
* containing at least one EObject.
*/
- public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_OR_LIST =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return IS_NON_NULL_EOBJECT.apply(input) || IS_NON_EMPTY_EOBJECT_LIST.apply(input);
- }
- };
+ public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_OR_LIST = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return IS_NON_NULL_EOBJECT.apply(input) || IS_NON_EMPTY_EOBJECT_LIST.apply(input);
+ }
+ };
/**
* Predicate specifying whether an {@link Object} is not null and an {@link EObject}.
*/
- public static final Predicate<? super Object> IS_NON_NULL_EOBJECT =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return input != null && input instanceof EObject;
- }
- };
+ public static final Predicate<? super Object> IS_NON_NULL_EOBJECT = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return input != null && input instanceof EObject;
+ }
+ };
/**
* Predicate specifying whether an {@link Object} is a list of {@link EObject EObjects} containing at least one
* EObject.
*/
- public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_LIST =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return input instanceof List<?> && isNonEmptyEObjectList((List<?>) input);
- }
- };
+ public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_LIST = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return input instanceof List<?> && isNonEmptyEObjectList((List<?>) input);
+ }
+ };
private static boolean isNonEmptyEObjectList(List<?> input) {
return !input.isEmpty() && all(input, IS_NON_NULL_EOBJECT);
@@ -397,22 +381,20 @@
/**
* Predicate specifying whether an {@link Object} is <code>null</code> or a list.
*/
- public static final Predicate<? super Object> IS_NULL_OR_LIST =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return input == null || IS_LIST.apply(input);
- }
- };
+ public static final Predicate<? super Object> IS_NULL_OR_LIST = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return input == null || IS_LIST.apply(input);
+ }
+ };
/**
* Predicate specifying whether an {@link Object} is a list.
*/
- public static final Predicate<? super Object> IS_LIST =
- new Predicate<Object>() {
- public boolean apply(Object input) {
- return input instanceof List<?>;
- }
- };
+ public static final Predicate<? super Object> IS_LIST = new Predicate<Object>() {
+ public boolean apply(Object input) {
+ return input instanceof List<?>;
+ }
+ };
/**
* Predicate specifying whether an {@link Object} is the container of an {@link EObject} that itself has at most the
@@ -422,7 +404,8 @@
* @return <code>true</code> if it contains an {@link EObject} that itself has a less or equal number of
* containments than specified in {@code maxNumberOfContainments}, <code>false</code> otherwise.
*/
- public static Predicate<? super Object> containsEObjectWithMaxNumberOfContainments(final int maxNumberOfContainments) {
+ public static Predicate<? super Object> containsEObjectWithMaxNumberOfContainments(
+ final int maxNumberOfContainments) {
return new Predicate<Object>() {
public boolean apply(Object input) {
return input != null
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java
index 527450f..0675883 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java
@@ -127,8 +127,8 @@
final boolean success;
if (newValue != null) {
if (eReference.isMany()) {
- final int insertionIndex = getTargetContainerSelector().
- getRandomIndexFromTargetObjectAndFeatureValueRange();
+ final int insertionIndex = getTargetContainerSelector()
+ .getRandomIndexFromTargetObjectAndFeatureValueRange();
getUtil().addPerCommand(eObject, eReference, newValue, insertionIndex);
} else {
getUtil().setPerCommand(eObject, eReference, newValue);
@@ -155,8 +155,7 @@
final EObject newReferenceValue;
final EReference eReference = (EReference) getTargetContainerSelector().getTargetFeature();
- final Iterable<EObject> suitableEObjects = getUtil().
- getSuitableEObjectsForAvailableFeature(eReference);
+ final Iterable<EObject> suitableEObjects = getUtil().getSuitableEObjectsForAvailableFeature(eReference);
final int numberOfAvailableEObjects = size(suitableEObjects);
if (numberOfAvailableEObjects < 1) {
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java
index 7f74aca..9e180f6 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java
@@ -135,9 +135,8 @@
private ResourceSet createResourceSet(int howManyResources) {
final ResourceSet resourceSet = new ResourceSetImpl();
for (int i = 0; i < howManyResources; i++) {
- final Resource resource =
- resourceSet.createResource(
- createVirtualUri(Integer.toString(i)));
+ final Resource resource = resourceSet.createResource(
+ createVirtualUri(Integer.toString(i)));
resources.add(resource);
}
return resourceSet;
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
index e533cc7..0a0e4d6 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore mongoDB Client
Bundle-SymbolicName: org.eclipse.emf.emfstore.mongodb.client;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)",
org.eclipselabs.mongo;bundle-version="[0.7.1,1.0.0)",
org.eclipselabs.mongo.emf.ext;bundle-version="[0.7.1,1.0.0)",
- org.eclipse.emf.emfstore.mongodb;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.mongodb;bundle-version="[1.9.0,2.0.0)"
Import-Package: org.osgi.service.cm;version="0.0.0"
Service-Component: OSGI-INF/config.xml,
OSGI-INF/provider.xml
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.mongodb.client;version="1.8.1
+Export-Package: org.eclipse.emf.emfstore.mongodb.client;version="1.9.0
";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
index b226450..c88c30a 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.client/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.mongodb.client</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
index d4219e0..6df5ef8 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore mongoDB Server
Bundle-SymbolicName: org.eclipse.emf.emfstore.mongodb.server;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipselabs.mongo;bundle-version="[0.7.1,1.0.0)",
org.eclipselabs.mongo.emf.ext;bundle-version="[0.7.1,1.0.0)",
- org.eclipse.emf.emfstore.mongodb;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.mongodb;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.server;bundle-version="[1.9.0,2.0.0)"
Import-Package: org.osgi.service.cm;version="0.0.0"
Service-Component: OSGI-INF/config.xml,
OSGI-INF/provider.xml
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.mongodb.server;version="1.8.1
+Export-Package: org.eclipse.emf.emfstore.mongodb.server;version="1.9.0
";x-internal:=true
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
index 7593756..6f0c947 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb.server/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.mongodb.server</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
index 1b05d90..a3be3a8 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore mongoDB
Bundle-SymbolicName: org.eclipse.emf.emfstore.mongodb;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipselabs.mongo;bundle-version="[0.7.1,1.0.0)",
org.eclipselabs.mongo.emf.ext;bundle-version="[0.7.1,1.0.0)",
- org.eclipse.emf.emfstore.common;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.common;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.server;bundle-version="[1.9.0,2.0.0)"
Import-Package: org.osgi.service.cm;version="0.0.0"
Service-Component: OSGI-INF/config.xml,
OSGI-INF/provider.xml
Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.emf.emfstore.mongodb;version="1.8.1";x-fri
+Export-Package: org.eclipse.emf.emfstore.mongodb;version="1.9.0";x-fri
ends:="org.eclipse.emf.emfstore.mongodb.client,org.eclipse.emf.emfsto
re.mongodb.server"
diff --git a/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml b/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
index c038c0a..f75cd0f 100644
--- a/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.mongodb/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.mongodb</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.jdt.ui.prefs
index a86f497..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -1,121 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Unmanaged profile 'ESCleanUp'
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Unmanaged profile 'ESFormatter'
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
index 9184551..180beeb 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/META-INF/MANIFEST.MF
@@ -2,30 +2,30 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Model Edit
Bundle-SymbolicName: org.eclipse.emf.emfstore.server.model.edit;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.emfstore.internal.server.model.provider.ServerEditPlugin$Implementation
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.emfstore.internal.server.model.accessc
- ontrol.provider;version="1.8.1";x-internal:=true,org.eclipse.emf.emfs
- tore.internal.server.model.accesscontrol.roles.provider;version="1.8.
- 1";x-internal:=true,org.eclipse.emf.emfstore.internal.server.model.pr
- ovider;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.client.mo
+ ontrol.provider;version="1.9.0";x-internal:=true,org.eclipse.emf.emfs
+ tore.internal.server.model.accesscontrol.roles.provider;version="1.9.
+ 0";x-internal:=true,org.eclipse.emf.emfstore.internal.server.model.pr
+ ovider;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.client.mo
del.edit,org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfsto
- re.internal.server.model.url.provider;version="1.8.1";x-internal:=tru
+ re.internal.server.model.url.provider;version="1.9.0";x-internal:=tru
e,org.eclipse.emf.emfstore.internal.server.model.versioning.events.pr
- ovider;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.inte
- rnal.server.model.versioning.events.server.provider;version="1.8.1";x
+ ovider;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.inte
+ rnal.server.model.versioning.events.server.provider;version="1.9.0";x
-internal:=true,org.eclipse.emf.emfstore.internal.server.model.versio
- ning.operations.provider;version="1.8.1";x-friends:="org.eclipse.emf.
+ ning.operations.provider;version="1.9.0";x-friends:="org.eclipse.emf.
emfstore.client.ui",org.eclipse.emf.emfstore.internal.server.model.ve
- rsioning.operations.semantic.provider;version="1.8.1";x-internal:=tru
+ rsioning.operations.semantic.provider;version="1.9.0";x-internal:=tru
e,org.eclipse.emf.emfstore.internal.server.model.versioning.provider;
- version="1.8.1";x-internal:=true
-Require-Bundle: org.eclipse.emf.emfstore.server.model;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.8.1,2.0.0)",
+ version="1.9.0";x-internal:=true
+Require-Bundle: org.eclipse.emf.emfstore.server.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml b/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
index b53f000..67e5af5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.server.model.edit</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java
index b8fd208..4ba6356 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java
@@ -61,11 +61,11 @@
* @generated
*/
protected void addMembersPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_ACGroup_members_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACGroup_members_feature", "_UI_ACGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AccesscontrolPackage.Literals.AC_GROUP__MEMBERS, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACGroup_members_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACGroup_members_feature", "_UI_ACGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ AccesscontrolPackage.Literals.AC_GROUP__MEMBERS, true, false, true, null, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java
index 620bce1..28a5186 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java
@@ -71,13 +71,12 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ACOrgUnit_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_name_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AccesscontrolPackage.Literals.AC_ORG_UNIT__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACOrgUnit_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_name_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ AccesscontrolPackage.Literals.AC_ORG_UNIT__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -87,11 +86,11 @@
* @generated
*/
protected void addRolesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_ACOrgUnit_roles_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_roles_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AccesscontrolPackage.Literals.AC_ORG_UNIT__ROLES, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACOrgUnit_roles_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_roles_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ AccesscontrolPackage.Literals.AC_ORG_UNIT__ROLES, true, false, true, null, null, null));
}
/**
@@ -101,14 +100,13 @@
* @generated
*/
protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ACOrgUnit_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ACOrgUnit_type"), //$NON-NLS-1$
- AccesscontrolPackage.Literals.AC_ORG_UNIT__DESCRIPTION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACOrgUnit_description_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ACOrgUnit_type"), //$NON-NLS-1$
+ AccesscontrolPackage.Literals.AC_ORG_UNIT__DESCRIPTION, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java
index c18a9b5..0f11163 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java
@@ -67,13 +67,12 @@
* @generated
*/
protected void addFirstNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ACUser_firstName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACUser_firstName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AccesscontrolPackage.Literals.AC_USER__FIRST_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACUser_firstName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACUser_firstName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ AccesscontrolPackage.Literals.AC_USER__FIRST_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -83,13 +82,12 @@
* @generated
*/
protected void addLastNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ACUser_lastName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACUser_lastName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AccesscontrolPackage.Literals.AC_USER__LAST_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACUser_lastName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACUser_lastName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ AccesscontrolPackage.Literals.AC_USER__LAST_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -100,13 +98,12 @@
* @generated
*/
protected void addPasswordPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ACUser_password_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ACUser_password_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- AccesscontrolPackage.Literals.AC_USER__PASSWORD, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ACUser_password_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ACUser_password_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ AccesscontrolPackage.Literals.AC_USER__PASSWORD, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java
index 98bafa5..c3acd24 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class AccesscontrolItemProviderAdapterFactory extends AccesscontrolAdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class AccesscontrolItemProviderAdapterFactory extends AccesscontrolAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java
index 4905944..ce40367 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java
@@ -38,8 +38,8 @@
*
* @generated
*/
-public class OrgUnitPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OrgUnitPropertyItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -75,14 +75,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_OrgUnitProperty_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_OrgUnitProperty_type"), //$NON-NLS-1$
- AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_OrgUnitProperty_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_OrgUnitProperty_type"), //$NON-NLS-1$
+ AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -92,14 +91,13 @@
* @generated
*/
protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_OrgUnitProperty_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_OrgUnitProperty_type"), //$NON-NLS-1$
- AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_OrgUnitProperty_value_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_OrgUnitProperty_type"), //$NON-NLS-1$
+ AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java
index 3750836..38caef7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java
@@ -33,8 +33,8 @@
*
* @generated
*/
-public class RoleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class RoleItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -68,11 +68,11 @@
* @generated
*/
protected void addProjectsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_Role_projects_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Role_projects_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- RolesPackage.Literals.ROLE__PROJECTS, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Role_projects_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Role_projects_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ RolesPackage.Literals.ROLE__PROJECTS, true, false, true, null, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java
index 177875d..917fce8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class RolesItemProviderAdapterFactory extends RolesAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable {
+public class RolesItemProviderAdapterFactory extends RolesAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java
index fff1726..b47b3b3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class AuthenticationInformationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AuthenticationInformationItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -153,8 +153,7 @@
newChildDescriptors.add(createChildParameter(ModelPackage.Literals.AUTHENTICATION_INFORMATION__SESSION_ID,
ModelFactory.eINSTANCE.createSessionId()));
- newChildDescriptors.add(createChildParameter(
- ModelPackage.Literals.AUTHENTICATION_INFORMATION__RESOLVED_AC_USER,
+ newChildDescriptors.add(createChildParameter(ModelPackage.Literals.AUTHENTICATION_INFORMATION__RESOLVED_AC_USER,
AccesscontrolFactory.eINSTANCE.createACUser()));
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java
index d133251..aa5d993 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java
@@ -35,8 +35,8 @@
*
* @generated
*/
-public class ClientVersionInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ClientVersionInfoItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -71,14 +71,13 @@
* @generated
*/
protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ClientVersionInfo_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ClientVersionInfo_type"), //$NON-NLS-1$
- ModelPackage.Literals.CLIENT_VERSION_INFO__VERSION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ClientVersionInfo_version_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ClientVersionInfo_type"), //$NON-NLS-1$
+ ModelPackage.Literals.CLIENT_VERSION_INFO__VERSION, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -89,14 +88,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ClientVersionInfo_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ClientVersionInfo_type"), //$NON-NLS-1$
- ModelPackage.Literals.CLIENT_VERSION_INFO__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ClientVersionInfo_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ClientVersionInfo_type"), //$NON-NLS-1$
+ ModelPackage.Literals.CLIENT_VERSION_INFO__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java
index d8b525e..9a0756d 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class ModelItemProviderAdapterFactory extends ModelAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable {
+public class ModelItemProviderAdapterFactory extends ModelAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java
index 94022d1..7b1b3ae 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java
@@ -38,8 +38,8 @@
*
* @generated
*/
-public class ProjectHistoryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProjectHistoryItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -74,14 +74,13 @@
* @generated
*/
protected void addProjectNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProjectHistory_projectName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectName_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ProjectHistory_type"), //$NON-NLS-1$
- ModelPackage.Literals.PROJECT_HISTORY__PROJECT_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ProjectHistory_projectName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ProjectHistory_type"), //$NON-NLS-1$
+ ModelPackage.Literals.PROJECT_HISTORY__PROJECT_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -91,14 +90,13 @@
* @generated
*/
protected void addProjectDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProjectHistory_projectDescription_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ProjectHistory_type"), //$NON-NLS-1$
- ModelPackage.Literals.PROJECT_HISTORY__PROJECT_DESCRIPTION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ProjectHistory_projectDescription_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ProjectHistory_type"), //$NON-NLS-1$
+ ModelPackage.Literals.PROJECT_HISTORY__PROJECT_DESCRIPTION, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java
index 064c769..1a4f262 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java
@@ -35,8 +35,8 @@
*
* @generated
*/
-public class ProjectInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProjectInfoItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -74,13 +74,12 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProjectInfo_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_name_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.PROJECT_INFO__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ProjectInfo_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_name_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ ModelPackage.Literals.PROJECT_INFO__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -90,14 +89,13 @@
* @generated
*/
protected void addDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProjectInfo_description_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ProjectInfo_type"), //$NON-NLS-1$
- ModelPackage.Literals.PROJECT_INFO__DESCRIPTION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ProjectInfo_description_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ProjectInfo_type"), //$NON-NLS-1$
+ ModelPackage.Literals.PROJECT_INFO__DESCRIPTION, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -109,10 +107,9 @@
protected void addProjectIdPropertyDescriptor(Object object) {
itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProjectInfo_projectId_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ProjectInfo_projectId_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getResourceLocator(), getString("_UI_ProjectInfo_projectId_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_projectId_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ProjectInfo_type"), //$NON-NLS-1$
ModelPackage.Literals.PROJECT_INFO__PROJECT_ID, true, false, true, null, null, null));
}
@@ -123,11 +120,12 @@
* @generated
*/
protected void addVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_ProjectInfo_version_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_version_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ModelPackage.Literals.PROJECT_INFO__VERSION, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ProjectInfo_version_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ProjectInfo_type"), //$NON-NLS-1$
+ ModelPackage.Literals.PROJECT_INFO__VERSION, true, false, true, null, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ServerSpaceItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ServerSpaceItemProvider.java
index e3c0c89..67c0340 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ServerSpaceItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ServerSpaceItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class ServerSpaceItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ServerSpaceItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java
index f10f179..929b5d4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java
@@ -35,8 +35,8 @@
*
* @generated
*/
-public class VersionInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class VersionInfoItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -70,14 +70,13 @@
* @generated
*/
protected void addEmfStoreVersionStringPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_VersionInfo_emfStoreVersionString_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VersionInfo_emfStoreVersionString_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_VersionInfo_type"), //$NON-NLS-1$
- ModelPackage.Literals.VERSION_INFO__EMF_STORE_VERSION_STRING, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_VersionInfo_emfStoreVersionString_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_VersionInfo_emfStoreVersionString_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_VersionInfo_type"), //$NON-NLS-1$
+ ModelPackage.Literals.VERSION_INFO__EMF_STORE_VERSION_STRING, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java
index d8896a1..8cb539a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java
@@ -38,8 +38,8 @@
*
* @generated
*/
-public class ModelElementUrlFragmentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ModelElementUrlFragmentItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -74,14 +74,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ModelElementUrlFragment_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ModelElementUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ModelElementUrlFragment_type"), //$NON-NLS-1$
- UrlPackage.Literals.MODEL_ELEMENT_URL_FRAGMENT__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ModelElementUrlFragment_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ModelElementUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ModelElementUrlFragment_type"), //$NON-NLS-1$
+ UrlPackage.Literals.MODEL_ELEMENT_URL_FRAGMENT__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java
index 469d212..eba2a2a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class ModelElementUrlItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ModelElementUrlItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java
index d645188..7e1051e 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java
@@ -38,8 +38,8 @@
*
* @generated
*/
-public class ProjectUrlFragmentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProjectUrlFragmentItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -74,14 +74,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ProjectUrlFragment_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ProjectUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ProjectUrlFragment_type"), //$NON-NLS-1$
- UrlPackage.Literals.PROJECT_URL_FRAGMENT__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ProjectUrlFragment_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ProjectUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ProjectUrlFragment_type"), //$NON-NLS-1$
+ UrlPackage.Literals.PROJECT_URL_FRAGMENT__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java
index e2959dd..0b0d022 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class ServerUrlItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ServerUrlItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -72,13 +72,12 @@
* @generated
*/
protected void addHostNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ServerUrl_hostName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_hostName_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- UrlPackage.Literals.SERVER_URL__HOST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ServerUrl_hostName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_hostName_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UrlPackage.Literals.SERVER_URL__HOST_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -89,13 +88,12 @@
* @generated
*/
protected void addPortPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ServerUrl_port_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_port_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- UrlPackage.Literals.SERVER_URL__PORT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ServerUrl_port_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_port_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ UrlPackage.Literals.SERVER_URL__PORT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+ null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java
index d2707e6..fd67dbb 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class UrlItemProviderAdapterFactory extends UrlAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable {
+public class UrlItemProviderAdapterFactory extends UrlAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java
index c13d34a..63920a8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java
@@ -37,8 +37,8 @@
*
* @generated
*/
-public class EventItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class EventItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -72,13 +72,12 @@
* @generated
*/
protected void addTimestampPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Event_timestamp_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Event_timestamp_feature", "_UI_Event_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- EventsPackage.Literals.EVENT__TIMESTAMP, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
- null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Event_timestamp_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Event_timestamp_feature", "_UI_Event_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ EventsPackage.Literals.EVENT__TIMESTAMP, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java
index 240a999..84952df 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class EventsItemProviderAdapterFactory extends EventsAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable {
+public class EventsItemProviderAdapterFactory extends EventsAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java
index db11b11..1d3402f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class ServerItemProviderAdapterFactory extends ServerAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable {
+public class ServerItemProviderAdapterFactory extends ServerAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java
index 9157775..b80df0b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java
@@ -109,10 +109,9 @@
protected void addModelElementIdPropertyDescriptor(Object object) {
itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AbstractOperation_modelElementId_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_AbstractOperation_modelElementId_feature", "_UI_AbstractOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getResourceLocator(), getString("_UI_AbstractOperation_modelElementId_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractOperation_modelElementId_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_AbstractOperation_type"), //$NON-NLS-1$
OperationsPackage.Literals.ABSTRACT_OPERATION__MODEL_ELEMENT_ID, true, false, true, null, null, null));
}
@@ -124,12 +123,10 @@
*/
protected void addAcceptedPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AbstractOperation_accepted_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_AbstractOperation_accepted_feature", "_UI_AbstractOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_AbstractOperation_accepted_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractOperation_accepted_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_AbstractOperation_type"), //$NON-NLS-1$
OperationsPackage.Literals.ABSTRACT_OPERATION__ACCEPTED, true, false, false,
ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
@@ -142,12 +139,10 @@
*/
protected void addClientDatePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AbstractOperation_clientDate_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_AbstractOperation_clientDate_feature", "_UI_AbstractOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_AbstractOperation_clientDate_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_AbstractOperation_clientDate_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_AbstractOperation_type"), //$NON-NLS-1$
OperationsPackage.Literals.ABSTRACT_OPERATION__CLIENT_DATE, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java
index 9501316..bbadb36 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java
@@ -65,14 +65,13 @@
* @generated
*/
protected void addOldValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AttributeOperation_oldValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_AttributeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.ATTRIBUTE_OPERATION__OLD_VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_AttributeOperation_oldValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_AttributeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.ATTRIBUTE_OPERATION__OLD_VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -82,14 +81,13 @@
* @generated
*/
protected void addNewValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_AttributeOperation_newValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_AttributeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.ATTRIBUTE_OPERATION__NEW_VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_AttributeOperation_newValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_AttributeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.ATTRIBUTE_OPERATION__NEW_VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
index 0639699..562c869 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
@@ -101,12 +101,12 @@
* @generated
*/
protected void addMainOperationPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_CompositeOperation_mainOperation_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_mainOperation_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_CompositeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.COMPOSITE_OPERATION__MAIN_OPERATION, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_CompositeOperation_mainOperation_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_mainOperation_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_CompositeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.COMPOSITE_OPERATION__MAIN_OPERATION, true, false, true, null, null, null));
}
/**
@@ -116,14 +116,13 @@
* @generated
*/
protected void addCompositeNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_CompositeOperation_compositeName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeName_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_CompositeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_CompositeOperation_compositeName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_CompositeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -133,14 +132,13 @@
* @generated
*/
protected void addCompositeDescriptionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_CompositeOperation_compositeDescription_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_CompositeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_DESCRIPTION, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_CompositeOperation_compositeDescription_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_CompositeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_DESCRIPTION, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -150,14 +148,13 @@
* @generated
*/
protected void addReversedPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_CompositeOperation_reversed_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_reversed_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_CompositeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.COMPOSITE_OPERATION__REVERSED, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_CompositeOperation_reversed_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_reversed_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_CompositeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.COMPOSITE_OPERATION__REVERSED, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java
index 3fe9aec..f6635de 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java
@@ -82,12 +82,10 @@
*/
protected void addDeletePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_CreateDeleteOperation_delete_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_CreateDeleteOperation_delete_feature", "_UI_CreateDeleteOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_CreateDeleteOperation_delete_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_CreateDeleteOperation_delete_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_CreateDeleteOperation_type"), //$NON-NLS-1$
OperationsPackage.Literals.CREATE_DELETE_OPERATION__DELETE, true, false, false,
ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
@@ -445,21 +443,18 @@
newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__MODEL_ELEMENT,
org.eclipse.emf.emfstore.internal.common.model.ModelFactory.eINSTANCE.createPropertyStringValue()));
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
+ newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
OperationsFactory.eINSTANCE.createSingleReferenceOperation()));
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
+ newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
OperationsFactory.eINSTANCE.createMultiReferenceSetOperation()));
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
+ newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
OperationsFactory.eINSTANCE.createMultiReferenceOperation()));
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.CREATE_DELETE_OPERATION__EOBJECT_TO_ID_MAP,
- OperationsFactory.eINSTANCE.create(OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP)));
+ newChildDescriptors
+ .add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__EOBJECT_TO_ID_MAP,
+ OperationsFactory.eINSTANCE.create(OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP)));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java
index 779c13e..6002dc3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java
@@ -33,8 +33,8 @@
*
* @generated
*/
-public class EObjectToModelElementIdMapItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class EObjectToModelElementIdMapItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -70,12 +70,12 @@
* @generated
*/
protected void addKeyPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_EObjectToModelElementIdMap_key_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_EObjectToModelElementIdMap_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_EObjectToModelElementIdMap_type"), //$NON-NLS-1$
- OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP__KEY, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_EObjectToModelElementIdMap_key_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_EObjectToModelElementIdMap_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_EObjectToModelElementIdMap_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP__KEY, true, false, true, null, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java
index 7494f20..f2fd6a4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java
@@ -65,14 +65,13 @@
* @generated
*/
protected void addFeatureNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_FeatureOperation_featureName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_featureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_FeatureOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.FEATURE_OPERATION__FEATURE_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_FeatureOperation_featureName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_featureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_FeatureOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.FEATURE_OPERATION__FEATURE_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -83,14 +82,13 @@
* @generated
*/
protected void addUnsetPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_FeatureOperation_unset_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_unset_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_FeatureOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.FEATURE_OPERATION__UNSET, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_FeatureOperation_unset_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_unset_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_FeatureOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.FEATURE_OPERATION__UNSET, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java
index 4daeca5..d9e0296 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java
@@ -37,8 +37,8 @@
*
* @generated
*/
-public class ModelElementGroupItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ModelElementGroupItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -75,12 +75,10 @@
*/
protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ModelElementGroup_name_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_name_feature", "_UI_ModelElementGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ModelElementGroup_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ModelElementGroup_type"), //$NON-NLS-1$
OperationsPackage.Literals.MODEL_ELEMENT_GROUP__NAME, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -109,10 +107,9 @@
protected void addModelElementsPropertyDescriptor(Object object) {
itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ModelElementGroup_modelElements_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_modelElements_feature", "_UI_ModelElementGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getResourceLocator(), getString("_UI_ModelElementGroup_modelElements_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_modelElements_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ModelElementGroup_type"), //$NON-NLS-1$
OperationsPackage.Literals.MODEL_ELEMENT_GROUP__MODEL_ELEMENTS, true, false, true, null, null, null));
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java
index 3c37bcc..806f484 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java
@@ -65,14 +65,13 @@
* @generated
*/
protected void addOldIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeMoveOperation_oldIndex_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__OLD_INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeMoveOperation_oldIndex_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__OLD_INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -82,14 +81,13 @@
* @generated
*/
protected void addNewIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeMoveOperation_newIndex_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__NEW_INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeMoveOperation_newIndex_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__NEW_INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -99,14 +97,13 @@
* @generated
*/
protected void addReferencedValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeMoveOperation_referencedValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
- "_UI_MultiAttributeMoveOperation_referencedValue_feature", "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__REFERENCED_VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeMoveOperation_referencedValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_MultiAttributeMoveOperation_referencedValue_feature", "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__REFERENCED_VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java
index 7d45a23..7bd22c1 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java
@@ -66,14 +66,13 @@
* @generated
*/
protected void addAddPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeOperation_add_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__ADD, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeOperation_add_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__ADD, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -83,14 +82,13 @@
* @generated
*/
protected void addIndexesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeOperation_indexes_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_indexes_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__INDEXES, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeOperation_indexes_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_indexes_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__INDEXES, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -100,14 +98,13 @@
* @generated
*/
protected void addReferencedValuesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeOperation_referencedValues_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_referencedValues_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__REFERENCED_VALUES, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeOperation_referencedValues_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_referencedValues_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__REFERENCED_VALUES, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java
index 36ba2f1..708810a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java
@@ -65,14 +65,13 @@
* @generated
*/
protected void addIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeSetOperation_index_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeSetOperation_index_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -82,14 +81,13 @@
* @generated
*/
protected void addOldValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeSetOperation_oldValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__OLD_VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeSetOperation_oldValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__OLD_VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -99,14 +97,13 @@
* @generated
*/
protected void addNewValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiAttributeSetOperation_newValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__NEW_VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiAttributeSetOperation_newValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__NEW_VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java
index 5df909d..b14fdfa 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java
@@ -66,14 +66,13 @@
* @generated
*/
protected void addOldIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiReferenceMoveOperation_oldIndex_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__OLD_INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiReferenceMoveOperation_oldIndex_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__OLD_INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -83,14 +82,13 @@
* @generated
*/
protected void addNewIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiReferenceMoveOperation_newIndex_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__NEW_INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiReferenceMoveOperation_newIndex_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__NEW_INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -100,15 +98,14 @@
* @generated
*/
protected void addReferencedModelElementIdPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiReferenceMoveOperation_referencedModelElementId_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
- "_UI_MultiReferenceMoveOperation_referencedModelElementId_feature", //$NON-NLS-1$
- "_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, true, false, true,
- null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiReferenceMoveOperation_referencedModelElementId_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_MultiReferenceMoveOperation_referencedModelElementId_feature", //$NON-NLS-1$
+ "_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, true, false,
+ true, null, null, null));
}
// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java
index 0ec4303..63dcee3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java
@@ -69,14 +69,13 @@
* @generated
*/
protected void addAddPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiReferenceOperation_add_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__ADD, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiReferenceOperation_add_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__ADD, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -86,14 +85,13 @@
* @generated
*/
protected void addIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiReferenceOperation_index_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiReferenceOperation_index_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -156,7 +154,8 @@
final String elemNames = getModelElementClassesAndNames(op.getReferencedModelElements(), featureType);
final String elementNameAndClass = getModelElementClassAndName(op.getModelElementId());
- final String children = op.getReferencedModelElements().size() > 1 ? Messages.MultiReferenceOperationItemProvider_Children
+ final String children = op.getReferencedModelElements().size() > 1
+ ? Messages.MultiReferenceOperationItemProvider_Children
: Messages.MultiReferenceOperationItemProvider_Child;
final boolean isAdd = op.isAdd();
@@ -214,9 +213,9 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__REFERENCED_MODEL_ELEMENTS,
- ModelFactory.eINSTANCE.createModelElementId()));
+ newChildDescriptors
+ .add(createChildParameter(OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__REFERENCED_MODEL_ELEMENTS,
+ ModelFactory.eINSTANCE.createModelElementId()));
}
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java
index 3aee8a3..a4c6ea4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java
@@ -65,14 +65,13 @@
* @generated
*/
protected void addIndexPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_MultiReferenceSetOperation_index_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_MultiReferenceSetOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__INDEX, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_MultiReferenceSetOperation_index_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_MultiReferenceSetOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__INDEX, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -167,13 +166,13 @@
protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__OLD_VALUE,
- ModelFactory.eINSTANCE.createModelElementId()));
+ newChildDescriptors
+ .add(createChildParameter(OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__OLD_VALUE,
+ ModelFactory.eINSTANCE.createModelElementId()));
- newChildDescriptors.add(createChildParameter(
- OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__NEW_VALUE,
- ModelFactory.eINSTANCE.createModelElementId()));
+ newChildDescriptors
+ .add(createChildParameter(OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__NEW_VALUE,
+ ModelFactory.eINSTANCE.createModelElementId()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java
index ef1cdda..1194978 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java
@@ -37,8 +37,8 @@
*
* @generated
*/
-public class OperationGroupItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OperationGroupItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -85,14 +85,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_OperationGroup_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_name_feature", //$NON-NLS-2$ //$NON-NLS-1$
- "_UI_OperationGroup_type"), //$NON-NLS-1$
- OperationsPackage.Literals.OPERATION_GROUP__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_OperationGroup_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_OperationGroup_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.OPERATION_GROUP__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -102,12 +101,12 @@
* @generated
*/
protected void addOperationsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_OperationGroup_operations_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_operations_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_OperationGroup_type"), //$NON-NLS-1$
- OperationsPackage.Literals.OPERATION_GROUP__OPERATIONS, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_OperationGroup_operations_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_operations_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_OperationGroup_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.OPERATION_GROUP__OPERATIONS, true, false, true, null, null, null));
}
// BEGIN OF CUSTOM CODE
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java
index 1473067..229bf30 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class OperationsItemProviderAdapterFactory extends OperationsAdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class OperationsItemProviderAdapterFactory extends OperationsAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java
index d5a8554..7b6f548 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java
@@ -66,14 +66,13 @@
* @generated
*/
protected void addBidirectionalPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ReferenceOperation_bidirectional_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_bidirectional_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.REFERENCE_OPERATION__BIDIRECTIONAL, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ReferenceOperation_bidirectional_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_bidirectional_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.REFERENCE_OPERATION__BIDIRECTIONAL, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -83,14 +82,13 @@
* @generated
*/
protected void addOppositeFeatureNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ReferenceOperation_oppositeFeatureName_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_oppositeFeatureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.REFERENCE_OPERATION__OPPOSITE_FEATURE_NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ReferenceOperation_oppositeFeatureName_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_oppositeFeatureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.REFERENCE_OPERATION__OPPOSITE_FEATURE_NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -100,14 +98,13 @@
* @generated
*/
protected void addContainmentTypePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ReferenceOperation_containmentType_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_containmentType_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_ReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.REFERENCE_OPERATION__CONTAINMENT_TYPE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ReferenceOperation_containmentType_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_containmentType_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.REFERENCE_OPERATION__CONTAINMENT_TYPE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java
index 6e5d997..1fded29 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java
@@ -64,12 +64,12 @@
* @generated
*/
protected void addOldValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_SingleReferenceOperation_oldValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__OLD_VALUE, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_SingleReferenceOperation_oldValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__OLD_VALUE, true, false, true, null, null, null));
}
/**
@@ -79,12 +79,12 @@
* @generated
*/
protected void addNewValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_SingleReferenceOperation_newValue_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
- OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__NEW_VALUE, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_SingleReferenceOperation_newValue_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
+ OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__NEW_VALUE, true, false, true, null, null, null));
}
// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java
index 0d6155f..cd417f4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class SemanticItemProviderAdapterFactory extends SemanticAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable {
+public class SemanticItemProviderAdapterFactory extends SemanticAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java
index c7d5683..c9ff7c3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java
@@ -38,8 +38,8 @@
*
* @generated
*/
-public class BranchInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class BranchInfoItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -74,13 +74,12 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_BranchInfo_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_BranchInfo_name_feature", "_UI_BranchInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.BRANCH_INFO__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_BranchInfo_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_BranchInfo_name_feature", "_UI_BranchInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VersioningPackage.Literals.BRANCH_INFO__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java
index 9c948ea..6e308ee 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java
@@ -39,8 +39,8 @@
*
* @generated
*/
-public class ChangePackageEnvelopeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ChangePackageEnvelopeItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
@@ -80,12 +80,10 @@
*/
protected void addFragmentIndexPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ChangePackageEnvelope_fragmentIndex_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentIndex_feature", "_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ChangePackageEnvelope_fragmentIndex_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$
VersioningPackage.Literals.CHANGE_PACKAGE_ENVELOPE__FRAGMENT_INDEX, true, false, false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
@@ -99,12 +97,10 @@
*/
protected void addFragmentCountPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ChangePackageEnvelope_fragmentCount_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentCount_feature", "_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ChangePackageEnvelope_fragmentCount_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentCount_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$
VersioningPackage.Literals.CHANGE_PACKAGE_ENVELOPE__FRAGMENT_COUNT, true, false, false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java
index 9f80e55..c170d8b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java
@@ -39,8 +39,8 @@
*
* @generated
*/
-public class ChangePackageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ChangePackageItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java
index 3dec8bb..9f1010b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class ChangePackageProxyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ChangePackageProxyItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -79,12 +79,10 @@
*/
protected void addIdPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_ChangePackageProxy_id_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_ChangePackageProxy_id_feature", "_UI_ChangePackageProxy_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_ChangePackageProxy_id_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_ChangePackageProxy_id_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_ChangePackageProxy_type"), //$NON-NLS-1$
VersioningPackage.Literals.CHANGE_PACKAGE_PROXY__ID, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java
index e5df5cf..0b130ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java
@@ -64,14 +64,13 @@
* @generated
*/
protected void addDatePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_DateVersionSpec_date_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_DateVersionSpec_date_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_DateVersionSpec_type"), //$NON-NLS-1$
- VersioningPackage.Literals.DATE_VERSION_SPEC__DATE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_DateVersionSpec_date_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_DateVersionSpec_date_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_DateVersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.DATE_VERSION_SPEC__DATE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java
index fa790c4..8137571 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java
@@ -39,8 +39,8 @@
*
* @generated
*/
-public class FileBasedChangePackageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FileBasedChangePackageItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -78,12 +78,10 @@
*/
protected void addFilePathPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_FileBasedChangePackage_filePath_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_FileBasedChangePackage_filePath_feature", "_UI_FileBasedChangePackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_FileBasedChangePackage_filePath_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_FileBasedChangePackage_filePath_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_FileBasedChangePackage_type"), //$NON-NLS-1$
VersioningPackage.Literals.FILE_BASED_CHANGE_PACKAGE__FILE_PATH, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -186,9 +184,9 @@
newChildDescriptors.add(createChildParameter(VersioningPackage.Literals.ABSTRACT_CHANGE_PACKAGE__LOG_MESSAGE,
VersioningFactory.eINSTANCE.createLogMessage()));
- newChildDescriptors.add(createChildParameter(
- VersioningPackage.Literals.FILE_BASED_CHANGE_PACKAGE__OPERATION_PROXIES,
- VersioningFactory.eINSTANCE.createOperationProxy()));
+ newChildDescriptors
+ .add(createChildParameter(VersioningPackage.Literals.FILE_BASED_CHANGE_PACKAGE__OPERATION_PROXIES,
+ VersioningFactory.eINSTANCE.createOperationProxy()));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java
index f9f7792..47eb1ac 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java
@@ -41,8 +41,8 @@
*
* @generated
*/
-public class HistoryInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class HistoryInfoItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -92,13 +92,12 @@
* @generated
*/
protected void addLogMessagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_HistoryInfo_logMessage_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_HistoryInfo_logMessage_feature", "_UI_HistoryInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.HISTORY_INFO__LOG_MESSAGE, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_HistoryInfo_logMessage_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_HistoryInfo_logMessage_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_HistoryInfo_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.HISTORY_INFO__LOG_MESSAGE, true, false, true, null, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java
index f82a773..4066c6c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class HistoryQueryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class HistoryQueryItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -73,12 +73,12 @@
* @generated
*/
protected void addSourcePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_HistoryQuery_source_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_source_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_HistoryQuery_type"), //$NON-NLS-1$
- VersioningPackage.Literals.HISTORY_QUERY__SOURCE, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_HistoryQuery_source_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_source_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_HistoryQuery_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.HISTORY_QUERY__SOURCE, true, false, true, null, null, null));
}
/**
@@ -88,14 +88,13 @@
* @generated
*/
protected void addIncludeChangePackagesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_HistoryQuery_includeChangePackages_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeChangePackages_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_HistoryQuery_type"), //$NON-NLS-1$
- VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_CHANGE_PACKAGES, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_HistoryQuery_includeChangePackages_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeChangePackages_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_HistoryQuery_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_CHANGE_PACKAGES, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -105,14 +104,13 @@
* @generated
*/
protected void addIncludeAllVersionsPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_HistoryQuery_includeAllVersions_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeAllVersions_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_HistoryQuery_type"), //$NON-NLS-1$
- VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_ALL_VERSIONS, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_HistoryQuery_includeAllVersions_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeAllVersions_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_HistoryQuery_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_ALL_VERSIONS, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java
index 45399c2..86dee87 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class LogMessageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class LogMessageItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -74,13 +74,13 @@
* @generated
*/
protected void addMessagePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_LogMessage_message_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_message_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.LOG_MESSAGE__MESSAGE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_LogMessage_message_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_message_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_LogMessage_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.LOG_MESSAGE__MESSAGE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -91,13 +91,12 @@
* @generated
*/
protected void addDatePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_LogMessage_date_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_date_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.LOG_MESSAGE__DATE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_LogMessage_date_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_date_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VersioningPackage.Literals.LOG_MESSAGE__DATE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -108,12 +107,10 @@
*/
protected void addClientDatePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_LogMessage_clientDate_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_LogMessage_clientDate_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_LogMessage_clientDate_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_clientDate_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_LogMessage_type"), //$NON-NLS-1$
VersioningPackage.Literals.LOG_MESSAGE__CLIENT_DATE, true, false, false,
ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
@@ -125,13 +122,12 @@
* @generated
*/
protected void addAuthorPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_LogMessage_author_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_author_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.LOG_MESSAGE__AUTHOR, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_LogMessage_author_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_author_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VersioningPackage.Literals.LOG_MESSAGE__AUTHOR, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java
index 53555e7..505fa1a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java
@@ -68,14 +68,13 @@
* @generated
*/
protected void addMaxChangesPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PagedUpdateVersionSpec_maxChanges_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_maxChanges_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
- VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__MAX_CHANGES, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_PagedUpdateVersionSpec_maxChanges_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_maxChanges_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__MAX_CHANGES, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -86,14 +85,13 @@
* @generated
*/
protected void addBaseVersionSpecPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PagedUpdateVersionSpec_baseVersionSpec_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_baseVersionSpec_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
- VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__BASE_VERSION_SPEC, true, false, true, null, null,
- null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_PagedUpdateVersionSpec_baseVersionSpec_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_baseVersionSpec_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__BASE_VERSION_SPEC, true, false, true, null, null,
+ null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java
index 7a53f25..ba5eb15 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java
@@ -64,14 +64,13 @@
* @generated
*/
protected void addIdentifierPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PrimaryVersionSpec_identifier_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_identifier_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
- VersioningPackage.Literals.PRIMARY_VERSION_SPEC__IDENTIFIER, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_PrimaryVersionSpec_identifier_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_identifier_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.PRIMARY_VERSION_SPEC__IDENTIFIER, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
@@ -82,14 +81,13 @@
* @generated
*/
protected void addProjectStateChecksumPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_PrimaryVersionSpec_projectStateChecksum_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_projectStateChecksum_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
- VersioningPackage.Literals.PRIMARY_VERSION_SPEC__PROJECT_STATE_CHECKSUM, true, false, false,
- ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_PrimaryVersionSpec_projectStateChecksum_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_projectStateChecksum_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.PRIMARY_VERSION_SPEC__PROJECT_STATE_CHECKSUM, true, false, false,
+ ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java
index 7147bdb..59958ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java
@@ -67,12 +67,10 @@
*/
protected void addUpperLimitPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_RangeQuery_upperLimit_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_RangeQuery_upperLimit_feature", "_UI_RangeQuery_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_RangeQuery_upperLimit_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_upperLimit_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_RangeQuery_type"), //$NON-NLS-1$
VersioningPackage.Literals.RANGE_QUERY__UPPER_LIMIT, true, false, false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
@@ -85,12 +83,10 @@
*/
protected void addLowerLimitPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_RangeQuery_lowerLimit_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_RangeQuery_lowerLimit_feature", "_UI_RangeQuery_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_RangeQuery_lowerLimit_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_lowerLimit_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_RangeQuery_type"), //$NON-NLS-1$
VersioningPackage.Literals.RANGE_QUERY__LOWER_LIMIT, true, false, false,
ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
}
@@ -102,14 +98,13 @@
* @generated
*/
protected void addIncludeIncomingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_RangeQuery_includeIncoming_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeIncoming_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_RangeQuery_type"), //$NON-NLS-1$
- VersioningPackage.Literals.RANGE_QUERY__INCLUDE_INCOMING, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_RangeQuery_includeIncoming_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeIncoming_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_RangeQuery_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.RANGE_QUERY__INCLUDE_INCOMING, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -119,14 +114,13 @@
* @generated
*/
protected void addIncludeOutgoingPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_RangeQuery_includeOutgoing_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeOutgoing_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_RangeQuery_type"), //$NON-NLS-1$
- VersioningPackage.Literals.RANGE_QUERY__INCLUDE_OUTGOING, true, false, false,
- ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_RangeQuery_includeOutgoing_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeOutgoing_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_RangeQuery_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.RANGE_QUERY__INCLUDE_OUTGOING, true, false, false,
+ ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
}
/**
@@ -149,7 +143,7 @@
*/
@Override
public String getText(Object object) {
- final RangeQuery<?> rangeQuery = (RangeQuery<?>) object;
+ final RangeQuery rangeQuery = (RangeQuery) object;
return getString("_UI_RangeQuery_type") + " " + rangeQuery.isIncludeChangePackages(); //$NON-NLS-1$ //$NON-NLS-2$
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java
index 8f71181..1b17a58 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java
@@ -64,14 +64,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_TagVersionSpec_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_TagVersionSpec_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_TagVersionSpec_type"), //$NON-NLS-1$
- VersioningPackage.Literals.TAG_VERSION_SPEC__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_TagVersionSpec_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_TagVersionSpec_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TagVersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.TAG_VERSION_SPEC__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java
index 1963c6e..765046e 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java
@@ -37,8 +37,8 @@
*
* @generated
*/
-public class VersionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class VersionItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -77,11 +77,11 @@
* @generated
*/
protected void addNextVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_Version_nextVersion_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Version_nextVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.VERSION__NEXT_VERSION, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Version_nextVersion_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Version_nextVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ VersioningPackage.Literals.VERSION__NEXT_VERSION, true, false, true, null, null, null));
}
/**
@@ -91,11 +91,12 @@
* @generated
*/
protected void addPreviousVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_Version_previousVersion_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Version_previousVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.VERSION__PREVIOUS_VERSION, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Version_previousVersion_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Version_previousVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Version_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.VERSION__PREVIOUS_VERSION, true, false, true, null, null, null));
}
/**
@@ -105,11 +106,12 @@
* @generated
*/
protected void addAncestorVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_Version_ancestorVersion_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Version_ancestorVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.VERSION__ANCESTOR_VERSION, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Version_ancestorVersion_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Version_ancestorVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Version_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.VERSION__ANCESTOR_VERSION, true, false, true, null, null, null));
}
/**
@@ -121,10 +123,9 @@
protected void addBranchedVersionsPropertyDescriptor(Object object) {
itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Version_branchedVersions_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Version_branchedVersions_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getResourceLocator(), getString("_UI_Version_branchedVersions_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Version_branchedVersions_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Version_type"), //$NON-NLS-1$
VersioningPackage.Literals.VERSION__BRANCHED_VERSIONS, true, false, true, null, null, null));
}
@@ -135,11 +136,12 @@
* @generated
*/
protected void addMergedToVersionPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
- getString("_UI_Version_mergedToVersion_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_Version_mergedToVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.VERSION__MERGED_TO_VERSION, true, false, true, null, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_Version_mergedToVersion_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Version_mergedToVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Version_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.VERSION__MERGED_TO_VERSION, true, false, true, null, null, null));
}
/**
@@ -151,10 +153,9 @@
protected void addMergedFromVersionPropertyDescriptor(Object object) {
itemPropertyDescriptors
.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_Version_mergedFromVersion_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_Version_mergedFromVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getResourceLocator(), getString("_UI_Version_mergedFromVersion_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_Version_mergedFromVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_Version_type"), //$NON-NLS-1$
VersioningPackage.Literals.VERSION__MERGED_FROM_VERSION, true, false, true, null, null, null));
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java
index 1425ef6..d83d9a3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class VersionPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class VersionPropertyItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -73,14 +73,13 @@
* @generated
*/
protected void addNamePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_VersionProperty_name_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_VersionProperty_type"), //$NON-NLS-1$
- VersioningPackage.Literals.VERSION_PROPERTY__NAME, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_VersionProperty_name_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_VersionProperty_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.VERSION_PROPERTY__NAME, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
@@ -90,14 +89,13 @@
* @generated
*/
protected void addValuePropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_VersionProperty_value_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
- "_UI_VersionProperty_type"), //$NON-NLS-1$
- VersioningPackage.Literals.VERSION_PROPERTY__VALUE, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_VersionProperty_value_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_VersionProperty_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.VERSION_PROPERTY__VALUE, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java
index 41cb094..9c34478 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java
@@ -36,8 +36,8 @@
*
* @generated
*/
-public class VersionSpecItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
- ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class VersionSpecItemProvider extends ItemProviderAdapter
+ implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier. <!--
* begin-user-doc --> <!-- end-user-doc -->
@@ -71,13 +71,13 @@
* @generated
*/
protected void addBranchPropertyDescriptor(Object object) {
- itemPropertyDescriptors.add(createItemPropertyDescriptor(
- ((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
- getResourceLocator(),
- getString("_UI_VersionSpec_branch_feature"), //$NON-NLS-1$
- getString("_UI_PropertyDescriptor_description", "_UI_VersionSpec_branch_feature", "_UI_VersionSpec_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- VersioningPackage.Literals.VERSION_SPEC__BRANCH, true, false, false,
- ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(), getString("_UI_VersionSpec_branch_feature"), //$NON-NLS-1$
+ getString("_UI_PropertyDescriptor_description", "_UI_VersionSpec_branch_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_VersionSpec_type"), //$NON-NLS-1$
+ VersioningPackage.Literals.VERSION_SPEC__BRANCH, true, false, false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java
index 6127095..25ba726 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
*
* @generated
*/
-public class VersioningItemProviderAdapterFactory extends VersioningAdapterFactory implements
- ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class VersioningItemProviderAdapterFactory extends VersioningAdapterFactory
+ implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.jdt.ui.prefs
index a86f497..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.jdt.ui.prefs
@@ -1,121 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_functional_interfaces=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.insert_inferred_type_arguments=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_redundant_type_arguments=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_anonymous_class_creation=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_lambda=true
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup.use_type_arguments=false
-cleanup_profile=_Unmanaged profile 'ESCleanUp'
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_Unmanaged profile 'ESFormatter'
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.server.model/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
index 646fb80..9fccf8f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.server.model/META-INF/MANIFEST.MF
@@ -2,62 +2,62 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Server Model
Bundle-SymbolicName: org.eclipse.emf.emfstore.server.model;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.emfstore.internal.server.model;version
- ="1.8.1"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.e
+ ="1.9.0"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.e
mf.emfstore.client.model.edit, org.eclipse.emf.emfstore.client.test.
common, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.emfstor
e.server, org.eclipse.emf.emfstore.server.model.edit, org.eclipse.e
mf.emfstore.test.common, org.eclipse.emf.emfstore.server.test",org.e
- clipse.emf.emfstore.internal.server.model.accesscontrol;version="1.8.
- 1"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emf
+ clipse.emf.emfstore.internal.server.model.accesscontrol;version="1.9.
+ 0"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emf
store.client.model.edit, org.eclipse.emf.emfstore.client.ui, org.ec
lipse.emf.emfstore.server, org.eclipse.emf.emfstore.server.model.edi
t, org.eclipse.emf.emfstore.server.test, org.eclipse.emf.emfstore.c
lient.test.common, org.eclipse.emf.emfstore.test.common",org.eclipse
- .emf.emfstore.internal.server.model.accesscontrol.impl;version="1.8.1
+ .emf.emfstore.internal.server.model.accesscontrol.impl;version="1.9.0
";x-friends:="org.eclipse.emf.emfstore.server",org.eclipse.emf.emfsto
- re.internal.server.model.accesscontrol.roles;version="1.8.1"; x-frien
+ re.internal.server.model.accesscontrol.roles;version="1.9.0"; x-frien
ds:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfstore.clien
t.ui, org.eclipse.emf.emfstore.server, org.eclipse.emf.emfstore.ser
ver.model.edit, org.eclipse.emf.emfstore.server.test, org.eclipse.e
mf.emfstore.test.common",org.eclipse.emf.emfstore.internal.server.mod
- el.accesscontrol.roles.impl;version="1.8.1";x-friends:="org.eclipse.e
+ el.accesscontrol.roles.impl;version="1.9.0";x-friends:="org.eclipse.e
mf.emfstore.server",org.eclipse.emf.emfstore.internal.server.model.ac
- cesscontrol.roles.util;version="1.8.1";x-friends:="org.eclipse.emf.em
+ cesscontrol.roles.util;version="1.9.0";x-friends:="org.eclipse.emf.em
fstore.server,org.eclipse.emf.emfstore.server.model.edit",org.eclipse
- .emf.emfstore.internal.server.model.accesscontrol.util;version="1.8.1
+ .emf.emfstore.internal.server.model.accesscontrol.util;version="1.9.0
";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfstor
e.server.model.edit",org.eclipse.emf.emfstore.internal.server.model.d
- ao;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.server,org.ec
+ ao;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.server,org.ec
lipse.emf.emfstore.test.common",org.eclipse.emf.emfstore.internal.ser
- ver.model.impl;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.s
+ ver.model.impl;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.s
erver,org.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.test.c
ommon",org.eclipse.emf.emfstore.internal.server.model.impl.api;versio
- n="1.8.1"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.
+ n="1.9.0"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.
emf.emfstore.client.ui, org.eclipse.emf.emfstore.test.common, org.e
clipse.emf.emfstore.server.test, org.eclipse.emf.emfstore.server",or
g.eclipse.emf.emfstore.internal.server.model.impl.api.query;version="
- 1.8.1";x-friends:="org.eclipse.emf.emfstore.client.ui,org.eclipse.emf
+ 1.9.0";x-friends:="org.eclipse.emf.emfstore.client.ui,org.eclipse.emf
.emfstore.client,org.eclipse.emf.emfstore.client.test",org.eclipse.em
- f.emfstore.internal.server.model.impl.api.versionspec;version="1.8.1"
+ f.emfstore.internal.server.model.impl.api.versionspec;version="1.9.0"
; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfst
ore.client.ui, org.eclipse.emf.emfstore.server.test, org.eclipse.em
f.emfstore.test.common, org.eclipse.emf.emfstore.client.api.test",or
- g.eclipse.emf.emfstore.internal.server.model.url;version="1.8.1";x-fr
+ g.eclipse.emf.emfstore.internal.server.model.url;version="1.9.0";x-fr
iends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfstore.clie
nt,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emfsto
- re.internal.server.model.url.impl;version="1.8.1";x-friends:="org.ecl
+ re.internal.server.model.url.impl;version="1.9.0";x-friends:="org.ecl
ipse.emf.emfstore.server",org.eclipse.emf.emfstore.internal.server.mo
- del.url.util;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.ser
+ del.url.util;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.ser
ver,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emfst
- ore.internal.server.model.util;version="1.8.1";x-friends:="org.eclips
+ ore.internal.server.model.util;version="1.9.0";x-friends:="org.eclips
e.emf.emfstore.server,org.eclipse.emf.emfstore.server.model.edit",org
- .eclipse.emf.emfstore.internal.server.model.versioning;version="1.8.1
+ .eclipse.emf.emfstore.internal.server.model.versioning;version="1.9.0
"; x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfs
tore.client.model.edit, org.eclipse.emf.emfstore.client.ui, org.ecl
ipse.emf.emfstore.example.merging, org.eclipse.emf.emfstore.fuzzy.em
@@ -67,25 +67,25 @@
.test, org.eclipse.emf.emfstore.client.conflictdetection.test, org.
eclipse.emf.emfstore.client.changetracking.test, org.eclipse.emf.emf
store.client.test",org.eclipse.emf.emfstore.internal.server.model.ver
- sioning.events;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.s
+ sioning.events;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.s
erver,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emf
- store.internal.server.model.versioning.events.impl;version="1.8.1";x-
+ store.internal.server.model.versioning.events.impl;version="1.9.0";x-
friends:="org.eclipse.emf.emfstore.server",org.eclipse.emf.emfstore.i
- nternal.server.model.versioning.events.server;version="1.8.1";x-frien
+ nternal.server.model.versioning.events.server;version="1.9.0";x-frien
ds:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfstore.server.
model.edit",org.eclipse.emf.emfstore.internal.server.model.versioning
- .events.server.impl;version="1.8.1";x-friends:="org.eclipse.emf.emfst
+ .events.server.impl;version="1.9.0";x-friends:="org.eclipse.emf.emfst
ore.server",org.eclipse.emf.emfstore.internal.server.model.versioning
- .events.server.util;version="1.8.1";x-friends:="org.eclipse.emf.emfst
+ .events.server.util;version="1.9.0";x-friends:="org.eclipse.emf.emfst
ore.server,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.em
- f.emfstore.internal.server.model.versioning.events.util;version="1.8.
- 1";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfsto
+ f.emfstore.internal.server.model.versioning.events.util;version="1.9.
+ 0";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf.emfsto
re.server.model.edit",org.eclipse.emf.emfstore.internal.server.model.
- versioning.impl;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.
+ versioning.impl;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.
server,org.eclipse.emf.emfstore.client",org.eclipse.emf.emfstore.inte
- rnal.server.model.versioning.impl.persistent;version="1.8.1";x-friend
+ rnal.server.model.versioning.impl.persistent;version="1.9.0";x-friend
s:="org.eclipse.emf.emfstore.client",org.eclipse.emf.emfstore.interna
- l.server.model.versioning.operations;version="1.8.1"; x-friends:="org
+ l.server.model.versioning.operations;version="1.9.0"; x-friends:="org
.eclipse.emf.emfstore.client, org.eclipse.emf.emfstore.client.change
tracking.test, org.eclipse.emf.emfstore.client.conflictdetection.tes
t, org.eclipse.emf.emfstore.client.model.edit, org.eclipse.emf.emfs
@@ -96,34 +96,34 @@
mf.ecp.emfstore.ui.e3, org.eclipse.emf.emfstore.server.test, org.ec
lipse.emf.emfstore.fuzzy.emf.test, org.eclipse.emf.emfstore.client.t
est, org.eclipse.emf.emfstore.client.ui.test",org.eclipse.emf.emfsto
- re.internal.server.model.versioning.operations.impl;version="1.8.1";x
+ re.internal.server.model.versioning.operations.impl;version="1.9.0";x
-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.s
erver,org.eclipse.emf.emfstore.client.recording.test",org.eclipse.emf
.emfstore.internal.server.model.versioning.operations.semantic;versio
- n="1.8.1";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf
+ n="1.9.0";x-friends:="org.eclipse.emf.emfstore.server,org.eclipse.emf
.emfstore.client,org.eclipse.emf.emfstore.server.model.edit",org.ecli
pse.emf.emfstore.internal.server.model.versioning.operations.semantic
- .impl;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.server",or
+ .impl;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.server",or
g.eclipse.emf.emfstore.internal.server.model.versioning.operations.se
- mantic.util;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.serv
+ mantic.util;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.serv
er,org.eclipse.emf.emfstore.server.model.edit",org.eclipse.emf.emfsto
- re.internal.server.model.versioning.operations.util;version="1.8.1";
+ re.internal.server.model.versioning.operations.util;version="1.9.0";
x-friends:="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfstor
e.client.ui, org.eclipse.emf.emfstore.server, org.eclipse.emf.emfst
ore.server.model.edit, org.eclipse.emf.emfstore.client.test.common,
org.eclipse.emf.emfstore.client.recording.test, org.eclipse.emf.emf
store.test.common, org.eclipse.emf.emfstore.client.changetracking.te
st, org.eclipse.emf.emfstore.client.test",org.eclipse.emf.emfstore.i
- nternal.server.model.versioning.util;version="1.8.1"; x-friends:="org
+ nternal.server.model.versioning.util;version="1.9.0"; x-friends:="org
.eclipse.emf.emfstore.server, org.eclipse.emf.emfstore.client.test,
org.eclipse.emf.emfstore.server.model.edit, org.eclipse.emf.emfstor
- e.client.ui",org.eclipse.emf.emfstore.server;version="1.8.1",org.ecli
- pse.emf.emfstore.server.model;version="1.8.1",org.eclipse.emf.emfstor
- e.server.model.query;version="1.8.1",org.eclipse.emf.emfstore.server.
- model.versionspec;version="1.8.1"
-Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ e.client.ui",org.eclipse.emf.emfstore.server;version="1.9.0",org.ecli
+ pse.emf.emfstore.server.model;version="1.9.0",org.eclipse.emf.emfstor
+ e.server.model.query;version="1.9.0",org.eclipse.emf.emfstore.server.
+ model.versionspec;version="1.9.0"
+Require-Bundle: org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.common;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.common;bundle-version="[1.9.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/pom.xml b/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
index 6023c3a..318846b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server.model/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.server.model</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java
index a6f0ec2..7d6e052 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java
@@ -18,18 +18,18 @@
/**
* <!-- begin-user-doc --> A representation of the model object ' <em><b>Authentication Information</b></em>'.
*
- * @extends APIDelegate<ESGlobalProjectId><!-- end-user-doc --
+ * @extends APIDelegate<ESAuthenticationInformation><!-- end-user-doc --
* <!-- end-user-doc -->
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getSessionId <em>Session
- * Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getResolvedACUser <em>
- * Resolved AC User</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getSessionId
+ * <em>Session Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getResolvedACUser
+ * <em>Resolved AC User</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getAuthenticationInformation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java
index 820b22a..55ec193 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java
@@ -22,12 +22,12 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo#getVersion <em>Version</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getClientVersionInfo()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java
index 22514f7..e32fa9f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java
@@ -1011,8 +1011,8 @@
/**
* The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl
- * <em>Client Version Info</em>}' class.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl <em>Client Version Info</em>
+ * }' class.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java
index 06f8512..027a00c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java
@@ -26,26 +26,21 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectId
- * <em>Project Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getVersions
- * <em>Versions</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectName
- * <em>Project Name</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
- * <em>Project Description</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getSharedProperties
- * <em>Shared Properties</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getBranches
- * <em>Branches</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectId <em>Project Id</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getVersions <em>Versions</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectName
+ * <em>Project Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
+ * <em>Project Description</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getSharedProperties
+ * <em>Shared Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getBranches <em>Branches</em>}</li>
+ * </ul>
*
- * @see ModelPackage#getProjectHistory()
+ * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getProjectHistory()
* @model
* @generated
*/
@@ -152,8 +147,7 @@
String getProjectDescription();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
* <em>Project Description</em>}' attribute.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java
index 00dece8..85bd8a8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java
@@ -17,7 +17,7 @@
/**
* <!-- begin-user-doc --> A representation of the model object ' <em><b>Project Id</b></em>'.
*
- * @extends APIDelegate<ESGlobalProjectId><!-- end-user-doc -->
+ * @extends APIDelegate<ESGlobalProjectIdImpl><!-- end-user-doc -->
*
*
* @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getProjectId()
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java
index 0e9f0b4..126c27b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java
@@ -20,13 +20,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getDescription <em>Description</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getProjectId <em>Project Id</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getVersion <em>Version</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getProjectInfo()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java
index 3c7e108..b73c267 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java
@@ -27,14 +27,14 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getGroups <em>Groups</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getProjects <em>Projects</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getOpenSessions <em>Open Sessions
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getOpenSessions <em>Open Sessions</em>
+ * }</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getUsers <em>Users</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getServerSpace()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java
index cb6aa9c..bc1f919 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java
@@ -18,11 +18,11 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString <em>Emf Store Version
- * String</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString
+ * <em>Emf Store Version String</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getVersionInfo()
* @model
@@ -47,8 +47,7 @@
String getEmfStoreVersionString();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString
* <em>Emf Store Version String</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java
index f23eab6..e61e047 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java
@@ -16,16 +16,15 @@
/**
* <!-- begin-user-doc --> A representation of the model object ' <em><b>AC Group</b></em>'.
*
- * @extends APIDelegate<ESGroup>
- * <!-- end-user-doc -->
+ * <!-- end-user-doc -->
*
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACGroup#getMembers <em>Members</em>}
- * </li>
- * </ul>
- * </p>
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACGroup#getMembers <em>Members</em>}
+ * </li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolPackage#getACGroup()
* @model
@@ -47,7 +46,6 @@
* @model keys="identifier"
* @generated
*/
- @SuppressWarnings("rawtypes")
EList<ACOrgUnit> getMembers();
} // ACGroup
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java
index 617ded2..8b57e20 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java
@@ -24,23 +24,24 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getName <em>Name</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getRoles <em>Roles</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription <em>
- * Description </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getProperties <em>
- * Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription
+ * <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getProperties
+ * <em>Properties</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolPackage#getACOrgUnit()
* @model
* @generated
*/
public interface ACOrgUnit<E extends ESOrgUnit> extends IdentifiableElement, APIDelegate<E> {
+
/**
* Returns the value of the '<em><b>Name</b></em>' attribute. <!--
* begin-user-doc -->
@@ -116,8 +117,8 @@
/**
* Sets the value of the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription
- * <em>Description</em>}' attribute.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription <em>Description</em>
+ * }' attribute.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java
index f351ff7..f9235e6 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java
@@ -486,8 +486,8 @@
/**
* Returns the meta object for the attribute '
- * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription
- * <em>Description</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription <em>Description</em>
+ * }'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for the attribute '<em>Description</em>'.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java
index c3cdf97..5574586 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java
@@ -19,13 +19,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty#getValue <em>Value</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty#getProject <em>Project</em>}
* </li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolPackage#getOrgUnitProperty()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java
index fec571b..a47cc12 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java
@@ -33,7 +33,7 @@
*
* @generated
*/
-public class ACGroupImpl extends ACOrgUnitImpl<ESGroup>implements ACGroup {
+public class ACGroupImpl extends ACOrgUnitImpl<ESGroup> implements ACGroup {
/**
* @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACUserImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACUserImpl.java
index 52bdb55..f6476fa 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACUserImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACUserImpl.java
@@ -44,7 +44,7 @@
*
* @generated
*/
-public class ACUserImpl extends ACOrgUnitImpl<ESUser>implements ACUser {
+public class ACUserImpl extends ACOrgUnitImpl<ESUser> implements ACUser {
/**
* @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java
index d4aa105..3e740b3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java
@@ -452,9 +452,9 @@
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getACUser_LastName(), ecorePackage.getEString(), "lastName", null, 0, 1, ACUser.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getACUser_EffectiveGroups(), getACGroup(), null, "effectiveGroups", null, 0, -1, ACUser.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
+ initEReference(getACUser_EffectiveGroups(), getACGroup(), null, "effectiveGroups", null, 0, -1, //$NON-NLS-1$
+ ACUser.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getACUser_Password(), ecorePackage.getEString(), "password", null, 0, 1, ACUser.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -475,9 +475,9 @@
addEOperation(acOrgUnitEClass, getACOrgUnitId(), "getId", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
initEClass(acGroupEClass, ACGroup.class, "ACGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(getACGroup_Members(), getACOrgUnit(), null, "members", null, 0, -1, ACGroup.class, !IS_TRANSIENT, //$NON-NLS-1$
- !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
- IS_ORDERED);
+ initEReference(getACGroup_Members(), getACOrgUnit(), null, "members", null, 0, -1, ACGroup.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
getACGroup_Members().getEKeys().add(theModelPackage.getIdentifiableElement_Identifier());
initEClass(acOrgUnitIdEClass, ACOrgUnitId.class, "ACOrgUnitId", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java
index cd4b8ae..eb18c43 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java
@@ -29,15 +29,15 @@
* end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getName <em>Name
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getValue <em>Value
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getProject <em>
- * Project</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getName
+ * <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getValue
+ * <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getProject
+ * <em>Project</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java
index 88a92e8..8b8b8b3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java
@@ -24,11 +24,11 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role#getProjects <em>Projects
- * </em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role#getProjects
+ * <em>Projects</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.RolesPackage#getRole()
* @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java
index ceb83bf..4d480bc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java
@@ -215,8 +215,8 @@
int SERVER_ADMIN_FEATURE_COUNT = ROLE_FEATURE_COUNT + 0;
/**
- * Returns the meta object for class '
- * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role <em>Role</em>}'.
+ * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role
+ * <em>Role</em>}'.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
* @return the meta object for class '<em>Role</em>'.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java
index 63f46e3..a488190 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java
@@ -19,8 +19,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Admin Role</b></em>'. <!--
* end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java
index 1ca57ff..408afb5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java
@@ -18,8 +18,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Reader Role</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java
index 20c5b13..be152ac 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java
@@ -30,11 +30,11 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Role</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.impl.RoleImpl#getProjects <em>Projects
- * </em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.impl.RoleImpl#getProjects
+ * <em>Projects</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java
index 15c3ee3..188226c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java
@@ -110,8 +110,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link RolesPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link RolesPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java
index e2d2020..2691de0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java
@@ -18,8 +18,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Server Admin</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java
index d3a36f1..3ab2520 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java
@@ -18,8 +18,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Writer Role</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java
index 5ffea03..4cd6649 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java
@@ -86,7 +86,7 @@
}
@Override
- public Adapter caseACOrgUnit(@SuppressWarnings("rawtypes") ACOrgUnit object) {
+ public Adapter caseACOrgUnit(ACOrgUnit object) {
return createACOrgUnitAdapter();
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java
index 5d70b63..d27d472 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java
@@ -112,7 +112,6 @@
return result;
}
case AccesscontrolPackage.AC_ORG_UNIT: {
- @SuppressWarnings("rawtypes")
final ACOrgUnit acOrgUnit = (ACOrgUnit) theEObject;
T result = caseACOrgUnit(acOrgUnit);
if (result == null) {
@@ -189,7 +188,7 @@
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T caseACOrgUnit(@SuppressWarnings("rawtypes") ACOrgUnit object) {
+ public T caseACOrgUnit(ACOrgUnit object) {
return null;
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java
index e233c3f..adc4411 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java
@@ -27,13 +27,13 @@
* end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getSessionId <em>Session
- * Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getResolvedACUser <em>
- * Resolved AC User</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getSessionId
+ * <em>Session Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getResolvedACUser
+ * <em>Resolved AC User</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java
index 2dfe6fd..3d91ae3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java
@@ -24,12 +24,12 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl#getVersion <em>Version</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java
index 8238341..5c09170 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java
@@ -21,8 +21,6 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>File Identifier</b></em>'.
*
* @implements Serializable <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java
index 1fae6b1..0902e07 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java
@@ -142,8 +142,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -604,8 +605,8 @@
initEAttribute(getProjectHistory_ProjectName(), ecorePackage.getEString(), "projectName", null, 1, 1, //$NON-NLS-1$
ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEAttribute(getProjectHistory_ProjectDescription(), ecorePackage.getEString(), "projectDescription", null, //$NON-NLS-1$
- 1, 1, ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ initEAttribute(getProjectHistory_ProjectDescription(), ecorePackage.getEString(), "projectDescription", null, 1, //$NON-NLS-1$
+ 1, ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEReference(getProjectHistory_SharedProperties(), theModelPackage_1.getEMFStoreProperty(), null,
"sharedProperties", null, 0, -1, ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
@@ -624,8 +625,8 @@
initEReference(getProjectInfo_ProjectId(), getProjectId(), null, "projectId", null, 1, 1, //$NON-NLS-1$
ProjectInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getProjectInfo_Version(), theVersioningPackage.getPrimaryVersionSpec(), null, "version", null, //$NON-NLS-1$
- 1, 1, ProjectInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getProjectInfo_Version(), theVersioningPackage.getPrimaryVersionSpec(), null, "version", null, 1, //$NON-NLS-1$
+ 1, ProjectInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(sessionIdEClass, SessionId.class, "SessionId", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
@@ -651,9 +652,9 @@
initEClass(versionInfoEClass, VersionInfo.class, "VersionInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getVersionInfo_EmfStoreVersionString(), ecorePackage.getEString(), "emfStoreVersionString", //$NON-NLS-1$
- null, 0, 1, VersionInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
- IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getVersionInfo_EmfStoreVersionString(), ecorePackage.getEString(), "emfStoreVersionString", null, //$NON-NLS-1$
+ 0, 1, VersionInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
initEClass(clientVersionInfoEClass, ClientVersionInfo.class, "ClientVersionInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java
index 36d3d2d..1fad9ef 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java
@@ -18,8 +18,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Id</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java
index 44678d2..a9a2841 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java
@@ -26,6 +26,7 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Info</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getDescription <em>Description</em>}
@@ -33,7 +34,6 @@
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getProjectId <em>Project Id</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getVersion <em>Version</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java
index be09926..ee25d25 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java
@@ -38,16 +38,16 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getGroups <em>Groups</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getProjects <em>Projects
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getOpenSessions <em>Open
- * Sessions </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getProjects <em>Projects</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getOpenSessions
+ * <em>Open Sessions</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getUsers <em>Users</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java
index d680bf3..9d1321b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java
@@ -22,11 +22,11 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Version Info</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.VersionInfoImpl#getEmfStoreVersionString <em>Emf Store
- * Version String</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.VersionInfoImpl#getEmfStoreVersionString
+ * <em>Emf Store Version String</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESAuthenticationInformationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESAuthenticationInformationImpl.java
index 00c4cae..17893ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESAuthenticationInformationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESAuthenticationInformationImpl.java
@@ -25,7 +25,7 @@
* @author emueller
*/
public class ESAuthenticationInformationImpl extends
- AbstractAPIImpl<ESAuthenticationInformation, AuthenticationInformation>implements ESAuthenticationInformation {
+ AbstractAPIImpl<ESAuthenticationInformation, AuthenticationInformation> implements ESAuthenticationInformation {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java
index 0d94dc5..48ac76e 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java
@@ -22,7 +22,7 @@
* @author emueller
*
*/
-public class ESBranchInfoImpl extends AbstractAPIImpl<ESBranchInfo, BranchInfo>implements ESBranchInfo {
+public class ESBranchInfoImpl extends AbstractAPIImpl<ESBranchInfo, BranchInfo> implements ESBranchInfo {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java
index a2a6423..3e3854a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java
@@ -31,7 +31,7 @@
* @author emueller
*
*/
-public class ESChangePackageImpl extends ESAbstractChangePackageImpl<ChangePackage>implements ESChangePackage {
+public class ESChangePackageImpl extends ESAbstractChangePackageImpl<ChangePackage> implements ESChangePackage {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESGroupImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESGroupImpl.java
index cea1ba2..0e87c00 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESGroupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESGroupImpl.java
@@ -24,7 +24,7 @@
* @author emueller
*
*/
-public class ESGroupImpl extends ESOrgUnitImpl<ESGroup>implements ESGroup {
+public class ESGroupImpl extends ESOrgUnitImpl<ESGroup> implements ESGroup {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java
index 28d374a..93bccad 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java
@@ -29,7 +29,7 @@
*
* @author emueller
*/
-public class ESHistoryInfoImpl extends AbstractAPIImpl<ESHistoryInfo, HistoryInfo>implements ESHistoryInfo {
+public class ESHistoryInfoImpl extends AbstractAPIImpl<ESHistoryInfo, HistoryInfo> implements ESHistoryInfo {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java
index 12c9a0b..bc8946f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java
@@ -23,7 +23,7 @@
* @author emueller
*
*/
-public class ESLogMessageImpl extends AbstractAPIImpl<ESLogMessage, LogMessage>implements ESLogMessage {
+public class ESLogMessageImpl extends AbstractAPIImpl<ESLogMessage, LogMessage> implements ESLogMessage {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java
index f413cce..e055fd0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java
@@ -19,7 +19,7 @@
* Mapping between {@link ESOperation} and {@link AbstractOperation}.
*
*/
-public class ESOperationImpl extends AbstractAPIImpl<ESOperation, AbstractOperation>implements ESOperation {
+public class ESOperationImpl extends AbstractAPIImpl<ESOperation, AbstractOperation> implements ESOperation {
/**
* Constructs a new {@link ESOperation} by wrapping an internal operation type.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java
index 1a38889..fd625ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java
@@ -21,7 +21,7 @@
* @author emueller
*
*/
-public class ESOrgUnitIdImpl extends AbstractAPIImpl<ESOrgUnitIdImpl, ACOrgUnitId>implements ESOrgUnitId {
+public class ESOrgUnitIdImpl extends AbstractAPIImpl<ESOrgUnitIdImpl, ACOrgUnitId> implements ESOrgUnitId {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitImpl.java
index ae57643..63c5682 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitImpl.java
@@ -23,7 +23,7 @@
* @author emueller
*
*/
-public class ESOrgUnitImpl<E extends ESOrgUnit> extends AbstractAPIImpl<E, ACOrgUnit<E>>implements ESOrgUnit {
+public class ESOrgUnitImpl<E extends ESOrgUnit> extends AbstractAPIImpl<E, ACOrgUnit<E>> implements ESOrgUnit {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java
index a699283..f6ed9e7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java
@@ -21,7 +21,8 @@
* @author emueller
*
*/
-public class ESProjectHistoryImpl extends AbstractAPIImpl<ESProjectHistory, ProjectHistory>implements ESProjectHistory {
+public class ESProjectHistoryImpl extends AbstractAPIImpl<ESProjectHistory, ProjectHistory>
+ implements ESProjectHistory {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java
index 1ca92e9..b446277 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java
@@ -21,7 +21,7 @@
* @author emueller
*
*/
-public class ESRoleImpl extends AbstractAPIImpl<ESRole, Role>implements ESRole {
+public class ESRoleImpl extends AbstractAPIImpl<ESRole, Role> implements ESRole {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java
index 1b8d864..460e283 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java
@@ -21,7 +21,7 @@
* @author emueller
*
*/
-public class ESSessionIdImpl extends AbstractAPIImpl<ESSessionIdImpl, SessionId>implements ESSessionId {
+public class ESSessionIdImpl extends AbstractAPIImpl<ESSessionIdImpl, SessionId> implements ESSessionId {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESUserImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESUserImpl.java
index 645af12..6e58b7a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESUserImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESUserImpl.java
@@ -20,7 +20,7 @@
* @author emueller
*
*/
-public class ESUserImpl extends ESOrgUnitImpl<ESUser>implements ESUser {
+public class ESUserImpl extends ESOrgUnitImpl<ESUser> implements ESUser {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java
index 092a35a..fe68a32 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java
@@ -24,7 +24,7 @@
* @param <T> a subtype of the internal type {@link HistoryQuery}
*/
public abstract class ESHistoryQueryImpl<U extends ESHistoryQuery<?>, T extends HistoryQuery<U>>
- extends AbstractAPIImpl<U, T>implements ESHistoryQuery<U> {
+ extends AbstractAPIImpl<U, T> implements ESHistoryQuery<U> {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java
index e4163d1..2025e0f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java
@@ -29,7 +29,7 @@
* @author wesendon
* @author emueller
*/
-public class ESPathQueryImpl extends ESHistoryQueryImpl<ESPathQuery, PathQuery>implements ESPathQuery {
+public class ESPathQueryImpl extends ESHistoryQueryImpl<ESPathQuery, PathQuery> implements ESPathQuery {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java
index 9a88e5f..83feb71 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java
@@ -25,7 +25,7 @@
* @param <T> a subtype of the internal type {@link VersionSpec}
*/
public class ESVersionSpecImpl<U extends ESVersionSpec, T extends VersionSpec & APIDelegate<U>>
- extends AbstractAPIImpl<U, T>implements ESVersionSpec {
+ extends AbstractAPIImpl<U, T> implements ESVersionSpec {
/**
* Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java
index afabaf5..da6e161 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java
@@ -19,12 +19,12 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ModelElementUrlFragment#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ModelElementUrlFragment#getModelElementId <em>Model
- * Element Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ModelElementUrlFragment#getModelElementId
+ * <em>Model Element Id</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.url.UrlPackage#getModelElementUrlFragment()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java
index 4e38a3f..e523332 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java
@@ -19,12 +19,12 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ProjectUrlFragment#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ProjectUrlFragment#getProjectId <em>Project Id</em>}
* </li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.url.UrlPackage#getProjectUrlFragment()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java
index 3f44785..61f5105 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java
@@ -17,11 +17,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl#getHostName <em>Host Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl#getPort <em>Port</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.url.UrlPackage#getServerUrl()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java
index 17fcd3f..8bc0d90 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java
@@ -103,8 +103,7 @@
int SERVER_URL_FEATURE_COUNT = 2;
/**
- * The meta object id for the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl
* <em>Project Url Fragment</em>}' class.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
@@ -416,8 +415,8 @@
*/
interface Literals {
/**
- * The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl <em>Server Url</em>}' class.
+ * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl
+ * <em>Server Url</em>}' class.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
*
@@ -505,8 +504,8 @@
/**
* The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlImpl
- * <em>Model Element Url</em>}' class.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlImpl <em>Model Element Url</em>
+ * }' class.
* <!-- begin-user-doc --> <!--
* end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java
index b4f70b8..7599f94 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java
@@ -25,13 +25,13 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlFragmentImpl#getName <em>Name</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlFragmentImpl#getModelElementId <em>
- * Model Element Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlFragmentImpl#getModelElementId
+ * <em>Model Element Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java
index a124651..ca0510c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java
@@ -25,12 +25,12 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl#getProjectId <em>Project Id
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl#getProjectId
+ * <em>Project Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java
index 7c5380d..7ee0491 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java
@@ -21,11 +21,11 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Server Url</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl#getHostName <em>Host Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl#getPort <em>Port</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java
index 58c683b..4a37464 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java
@@ -102,8 +102,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link UrlPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link UrlPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -420,8 +421,8 @@
ModelElementUrl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModelElementUrl_ProjectUrlFragment(), getProjectUrlFragment(), null, "projectUrlFragment", //$NON-NLS-1$
- null, 0, 1, ModelElementUrl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
- IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ null, 0, 1, ModelElementUrl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getModelElementUrl_ModelElementUrlFragment(), getModelElementUrlFragment(), null,
"modelElementUrlFragment", null, 0, 1, ModelElementUrl.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java
index bd8d062..abab978 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java
@@ -118,8 +118,8 @@
}
/**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl <em>Server Url</em>}'.
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl
+ * <em>Server Url</em>}'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java
index c9d820c..d62e592 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java
@@ -27,11 +27,11 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage#getLogMessage <em>Log
- * Message</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage#getLogMessage
+ * <em>Log Message</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getAbstractChangePackage()
* @model interface="true" abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java
index f377578..28c5b75 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java
@@ -22,13 +22,13 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getTarget <em>
- * Target</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getSource <em>
- * Source</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getTarget
+ * <em>Target</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getSource
+ * <em>Source</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getAncestorVersionSpec()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java
index caa88ea..00c53e3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java
@@ -22,13 +22,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo#getHead <em>Head</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo#getSource <em>Source</em>}
* </li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getBranchInfo()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java
index a7329d8..0e837ec 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java
@@ -29,15 +29,15 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getOperations <em>
- * Operations</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getEvents <em>Events
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getVersionProperties <em>
- * Version Properties</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getOperations
+ * <em>Operations</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getEvents <em>Events</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getVersionProperties
+ * <em>Version Properties</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getChangePackage()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java
index edee50f..df5a100 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java
@@ -18,10 +18,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageProxy#getId <em>Id</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getChangePackageProxy()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java
index a154797..8c9c1f3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java
@@ -25,14 +25,14 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.FileBasedChangePackage#getFilePath <em>
- * File Path</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.FileBasedChangePackage#getFilePath
+ * <em>File Path</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.FileBasedChangePackage#getOperationProxies
* <em>Operation Proxies</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getFileBasedChangePackage()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java
index 760e923..3515f47 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java
@@ -23,27 +23,27 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec <em>Primary
- * Spec</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getNextSpec <em>Next Spec
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPreviousSpec <em>
- * Previous Spec</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedFrom <em>Merged
- * From</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedTo <em>Merged To
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage <em>Log
- * Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getTagSpecs <em>Tag Specs
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getVersionProperties <em>
- * Version Properties</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getChangePackage <em>Change
- * Package</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec
+ * <em>Primary Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getNextSpec
+ * <em>Next Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPreviousSpec
+ * <em>Previous Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedFrom
+ * <em>Merged From</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedTo
+ * <em>Merged To</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage
+ * <em>Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getTagSpecs
+ * <em>Tag Specs</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getVersionProperties
+ * <em>Version Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getChangePackage
+ * <em>Change Package</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getHistoryInfo()
* @model
@@ -69,8 +69,8 @@
/**
* Sets the value of the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec
- * <em>Primary Spec</em>}' containment reference.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec <em>Primary Spec</em>
+ * }' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -182,9 +182,8 @@
LogMessage getLogMessage();
/**
- * Sets the value of the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage <em>Log Message</em>}'
- * containment reference.
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage
+ * <em>Log Message</em>}' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java
index 1915ad5..ef94565 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java
@@ -24,16 +24,16 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getAuthor <em>Author</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getMessage <em>Message</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getClientDate <em>Client
- * Date</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getClientDate
+ * <em>Client Date</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getLogMessage()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java
index fbd5b62..80a85d4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java
@@ -20,10 +20,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.OperationProxy#getProxies <em>Proxies</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getOperationProxy()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java
index bd2342f..605ba80 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java
@@ -22,6 +22,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.PagedUpdateVersionSpec#getMaxChanges
* <em>Max Changes</em>}</li>
@@ -29,7 +30,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PagedUpdateVersionSpec#getBaseVersionSpec
* <em>Base Version Spec</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getPagedUpdateVersionSpec()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java
index 22754ba..41266cf 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java
@@ -22,14 +22,14 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec#getIdentifier <em>
- * Identifier</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec#getIdentifier
+ * <em>Identifier</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec#getProjectStateChecksum
* <em>Project State Checksum</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getPrimaryVersionSpec()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java
index 8bf1baf..bfdd960 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java
@@ -20,25 +20,25 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getPrimarySpec <em>Primary Spec</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getTagSpecs <em>Tag Specs</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getNextVersion <em>Next Version</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getPreviousVersion <em>Previous Version
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getPreviousVersion
+ * <em>Previous Version</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getLogMessage <em>Log Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getAncestorVersion <em>Ancestor Version
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getBranchedVersions <em>Branched
- * Versions</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedToVersion <em>Merged To Version
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedFromVersion <em>Merged From
- * Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getAncestorVersion
+ * <em>Ancestor Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getBranchedVersions
+ * <em>Branched Versions</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedToVersion
+ * <em>Merged To Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedFromVersion
+ * <em>Merged From Version</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getVersion()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java
index 22fa0a4..a0fdf5f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java
@@ -19,10 +19,10 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec#getBranch <em>Branch</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getVersionSpec()
* @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java
index 9a0fef0..efeffab 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java
@@ -19,11 +19,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.Event#getTimestamp <em>Timestamp</em>}
* </li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.events.EventsPackage#getEvent()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java
index cc282a2..c7f07e5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java
@@ -23,11 +23,11 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Event</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.impl.EventImpl#getTimestamp <em>Timestamp
- * </em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.impl.EventImpl#getTimestamp
+ * <em>Timestamp</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java
index 5931a06..79444f0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java
@@ -77,8 +77,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link EventsPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link EventsPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java
index 4846642..88e847d 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java
@@ -18,11 +18,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ProjectUpdatedEvent#getNewVersion
* <em>New Version</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ServerPackage#getProjectUpdatedEvent()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java
index 7e049ee..7a83ab7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java
@@ -17,11 +17,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ServerProjectEvent#getProjectId
* <em>Project Id</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ServerPackage#getServerProjectEvent()
* @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java
index d82ec6c..ae7f1ff 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java
@@ -24,12 +24,12 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.impl.ProjectUpdatedEventImpl#getNewVersion
* <em>New Version</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java
index 95cf8a6..3ce02fd 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java
@@ -17,8 +17,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Event</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java
index 69bfa84..07bc423 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java
@@ -93,8 +93,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link ServerPackage#eINSTANCE} when that field is accessed. Clients should not
- * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+ * This method is used to initialize {@link ServerPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
* @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java
index d610d36..966011f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java
@@ -23,12 +23,12 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Event</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.impl.ServerProjectEventImpl#getProjectId
* <em>Project Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java
index 629fdbc..6890aa5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java
@@ -25,13 +25,13 @@
* end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getTarget <em>
- * Target</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getSource <em>
- * Source</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getTarget
+ * <em>Target</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getSource
+ * <em>Source</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java
index 1b1f670..cd07882 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java
@@ -25,13 +25,13 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Branch Info</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.BranchInfoImpl#getName <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.BranchInfoImpl#getHead <em>Head</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.BranchInfoImpl#getSource <em>Source</em>}
* </li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java
index c7ddfcc..99e84d5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java
@@ -18,8 +18,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Branch Version Spec</b></em>'. <!--
* end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java
index b8c38bc..e5c6353 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java
@@ -37,13 +37,13 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.ChangePackageProxyImpl#getLogMessage <em>
- * Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.ChangePackageProxyImpl#getLogMessage
+ * <em>Log Message</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.ChangePackageProxyImpl#getId <em>Id</em>}
* </li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java
index 021ab64..7da125a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java
@@ -70,16 +70,16 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getLogMessage
* <em>Log Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getFilePath <em>
- * File Path</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getFilePath
+ * <em>File Path</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getOperationProxies
* <em>Operation Proxies</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java
index a44e809..c1ac114 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java
@@ -34,27 +34,27 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>History Info</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPrimarySpec <em>Primary
- * Spec</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getNextSpec <em>Next Spec
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPreviousSpec <em>
- * Previous Spec</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedFrom <em>Merged
- * From</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedTo <em>Merged To
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getLogMessage <em>Log
- * Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getTagSpecs <em>Tag Specs
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getVersionProperties <em>
- * Version Properties</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getChangePackage <em>Change
- * Package</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPrimarySpec
+ * <em>Primary Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getNextSpec
+ * <em>Next Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPreviousSpec
+ * <em>Previous Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedFrom
+ * <em>Merged From</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedTo
+ * <em>Merged To</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getLogMessage
+ * <em>Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getTagSpecs
+ * <em>Tag Specs</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getVersionProperties
+ * <em>Version Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getChangePackage
+ * <em>Change Package</em>}</li>
+ * </ul>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java
index 727498c..da86faf 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java
@@ -25,16 +25,16 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Log Message</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getAuthor <em>Author</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getMessage <em>Message</em>}
* </li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getClientDate <em>Client
- * Date</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getClientDate
+ * <em>Client Date</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java
index e410446..4e5c0dc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java
@@ -37,7 +37,7 @@
*
* @generated NOT
*/
-public class ModelElementQueryImpl extends RangeQueryImpl<ESModelElementQuery>implements ModelElementQuery {
+public class ModelElementQueryImpl extends RangeQueryImpl<ESModelElementQuery> implements ModelElementQuery {
/**
* The cached value of the '{@link #getModelElements() <em>Model Elements</em>}' containment reference list.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java
index d3ef1ba..2477845 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java
@@ -30,11 +30,11 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.OperationProxyImpl#getProxies <em>Proxies
- * </em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.OperationProxyImpl#getProxies
+ * <em>Proxies</em>}</li>
+ * </ul>
*
* @generated
*/
@@ -180,7 +180,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.OperationProxy#setImage(org.eclipse.emf.emfstore.internal.server.model.versioning.ImageProxy)
*/
public void setImage(ImageProxy imageProxy) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java
index 71676ae..6c4565f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java
@@ -26,6 +26,7 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PagedUpdateVersionSpecImpl#getMaxChanges
* <em>Max Changes</em>}</li>
@@ -33,7 +34,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PagedUpdateVersionSpecImpl#getBaseVersionSpec
* <em>Base Version Spec</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java
index b6f51b0..10207fa 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java
@@ -34,7 +34,7 @@
*
* @generated NOT
*/
-public class PathQueryImpl extends HistoryQueryImpl<ESPathQuery>implements PathQuery {
+public class PathQueryImpl extends HistoryQueryImpl<ESPathQuery> implements PathQuery {
/**
* @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java
index 9a97bb2..2c21288 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java
@@ -22,14 +22,14 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PrimaryVersionSpecImpl#getIdentifier <em>
- * Identifier</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PrimaryVersionSpecImpl#getIdentifier
+ * <em>Identifier</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PrimaryVersionSpecImpl#getProjectStateChecksum
* <em>Project State Checksum</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java
index 6f1aa4b..f4681fe 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java
@@ -38,7 +38,7 @@
*
* @param <T> a API range query subtype
*/
-public class RangeQueryImpl<T extends ESRangeQuery<?>> extends HistoryQueryImpl<T>implements RangeQuery<T> {
+public class RangeQueryImpl<T extends ESRangeQuery<?>> extends HistoryQueryImpl<T> implements RangeQuery<T> {
/**
* @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java
index 13b26a6..cbe9e7f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java
@@ -53,27 +53,27 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Version</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPrimarySpec <em>Primary Spec
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPrimarySpec
+ * <em>Primary Spec</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getTagSpecs <em>Tag Specs</em>}
* </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getNextVersion <em>Next Version
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPreviousVersion <em>Previous
- * Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getLogMessage <em>Log Message
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getAncestorVersion <em>Ancestor
- * Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getBranchedVersions <em>
- * Branched Versions</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedToVersion <em>Merged
- * To Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedFromVersion <em>Merged
- * From Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getNextVersion
+ * <em>Next Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPreviousVersion
+ * <em>Previous Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getLogMessage
+ * <em>Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getAncestorVersion
+ * <em>Ancestor Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getBranchedVersions
+ * <em>Branched Versions</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedToVersion
+ * <em>Merged To Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedFromVersion
+ * <em>Merged From Version</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java
index 6f01098..aabbbc0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java
@@ -21,11 +21,11 @@
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Version Spec</b></em>'. <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionSpecImpl#getBranch <em>Branch</em>}
* </li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java
index ca3110a..6ec4106 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java
@@ -1307,8 +1307,8 @@
initEReference(getChangePackage_Events(), theEventsPackage.getEvent(), null, "events", null, 0, -1, //$NON-NLS-1$
ChangePackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getChangePackage_VersionProperties(), getVersionProperty(), null, "versionProperties", null, 0, //$NON-NLS-1$
- -1, ChangePackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getChangePackage_VersionProperties(), getVersionProperty(), null, "versionProperties", null, //$NON-NLS-1$
+ 0, -1, ChangePackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(historyInfoEClass, HistoryInfo.class, "HistoryInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
@@ -1328,18 +1328,18 @@
initEReference(getHistoryInfo_MergedTo(), getPrimaryVersionSpec(), null, "mergedTo", null, 1, -1, //$NON-NLS-1$
HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getHistoryInfo_LogMessage(), getLogMessage(), null, "logMessage", null, 1, 1, HistoryInfo.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getHistoryInfo_TagSpecs(), getTagVersionSpec(), null, "tagSpecs", null, 0, -1, HistoryInfo.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
- initEReference(getHistoryInfo_VersionProperties(), getVersionProperty(), null, "versionProperties", null, 0, -1, //$NON-NLS-1$
+ initEReference(getHistoryInfo_LogMessage(), getLogMessage(), null, "logMessage", null, 1, 1, //$NON-NLS-1$
HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getHistoryInfo_ChangePackage(), getAbstractChangePackage(), null, "changePackage", null, 0, 1, //$NON-NLS-1$
+ initEReference(getHistoryInfo_TagSpecs(), getTagVersionSpec(), null, "tagSpecs", null, 0, -1, //$NON-NLS-1$
HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getHistoryInfo_VersionProperties(), getVersionProperty(), null, "versionProperties", null, //$NON-NLS-1$
+ 0, -1, HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getHistoryInfo_ChangePackage(), getAbstractChangePackage(), null, "changePackage", null, 0, //$NON-NLS-1$
+ 1, HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(historyQueryEClass, HistoryQuery.class, "HistoryQuery", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
IS_GENERATED_INSTANCE_CLASS);
@@ -1385,8 +1385,8 @@
initEReference(getVersion_TagSpecs(), getTagVersionSpec(), null, "tagSpecs", null, 0, -1, Version.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getVersion_NextVersion(), getVersion(), getVersion_PreviousVersion(), "nextVersion", null, 0, 1, //$NON-NLS-1$
- Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ initEReference(getVersion_NextVersion(), getVersion(), getVersion_PreviousVersion(), "nextVersion", //$NON-NLS-1$
+ null, 0, 1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getVersion_PreviousVersion(), getVersion(), getVersion_NextVersion(), "previousVersion", null, 0, //$NON-NLS-1$
1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
@@ -1428,9 +1428,9 @@
initEReference(getBranchInfo_Head(), getPrimaryVersionSpec(), null, "head", null, 0, 1, BranchInfo.class, //$NON-NLS-1$
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getBranchInfo_Source(), getPrimaryVersionSpec(), null, "source", null, 0, 1, BranchInfo.class, //$NON-NLS-1$
- !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
- !IS_DERIVED, IS_ORDERED);
+ initEReference(getBranchInfo_Source(), getPrimaryVersionSpec(), null, "source", null, 0, 1, //$NON-NLS-1$
+ BranchInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(ancestorVersionSpecEClass, AncestorVersionSpec.class, "AncestorVersionSpec", !IS_ABSTRACT, //$NON-NLS-1$
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/AbstractOperationEmitter.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/AbstractOperationEmitter.java
index 0e07075..a8198a3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/AbstractOperationEmitter.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/AbstractOperationEmitter.java
@@ -44,6 +44,7 @@
private final List<Long> backwardsOffsets = new ArrayList<Long>();
private int currentOpIndex;
private long startOffset;
+ private boolean isClosed;
/**
* Constructor.
@@ -265,6 +266,7 @@
* Closes the emitter.
*/
public void close() {
+ setClosed(true);
try {
reader.close();
} catch (final IOException ex) {
@@ -272,4 +274,15 @@
}
}
+ /**
+ * @return <code>true</code> if emitter was closed, <code>false</code> otherwise
+ */
+ protected boolean isClosed() {
+ return isClosed;
+ }
+
+ private void setClosed(boolean isClosed) {
+ this.isClosed = isClosed;
+ }
+
}
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java
index efe6736..ff66424 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java
@@ -21,7 +21,7 @@
/**
* For iterating operations from the beginning.
*/
- Forward,
+ Forward,
/**
* For iterating operations from the back.
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/OperationEmitter.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/OperationEmitter.java
index 5acdf25..d85b83f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/OperationEmitter.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/OperationEmitter.java
@@ -15,6 +15,8 @@
import java.io.IOException;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -39,6 +41,8 @@
*/
public class OperationEmitter extends AbstractOperationEmitter {
+ private final ExecutorService executorService;
+
/**
* Constructor.
*
@@ -49,6 +53,7 @@
*/
public OperationEmitter(Direction direction, File file) {
super(direction, file);
+ executorService = Executors.newCachedThreadPool();
}
/**
@@ -63,7 +68,7 @@
final PipedOutputStream pos = new PipedOutputStream();
final PipedInputStream pis = new PipedInputStream(pos);
- new Thread(new Runnable() {
+ executorService.execute(new Runnable() {
public void run() {
if (getDirection() == Direction.Forward) {
readForward(pos);
@@ -71,7 +76,15 @@
readBackward(pos);
}
}
- }).start();
+ });
+
+ if (isClosed()) {
+ try {
+ return Optional.absent();
+ } finally {
+ pis.close();
+ }
+ }
try {
final EObject deserializedObject = deserialize(pis);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/SerializedOperationEmitter.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/SerializedOperationEmitter.java
index 77486ba..bf23dfc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/SerializedOperationEmitter.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/SerializedOperationEmitter.java
@@ -17,6 +17,8 @@
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.util.Scanner;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation;
@@ -30,6 +32,8 @@
*/
public class SerializedOperationEmitter extends AbstractOperationEmitter {
+ private final ExecutorService executorService;
+
/**
* Constructor.
*
@@ -40,6 +44,7 @@
*/
public SerializedOperationEmitter(Direction direction, File file) {
super(direction, file);
+ executorService = Executors.newCachedThreadPool();
}
/**
@@ -54,7 +59,7 @@
final PipedOutputStream pos = new PipedOutputStream();
final PipedInputStream pis = new PipedInputStream(pos);
- new Thread(new Runnable() {
+ executorService.execute(new Runnable() {
public void run() {
if (getDirection() == Direction.Forward) {
readForward(pos);
@@ -62,7 +67,15 @@
readBackward(pos);
}
}
- }).start();
+ });
+
+ if (isClosed()) {
+ try {
+ return Optional.absent();
+ } finally {
+ pis.close();
+ }
+ }
try {
final String streamToString = convertStreamToString(pis);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java
index 99a0eda..1acba4c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java
@@ -16,13 +16,13 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getOldValue <em>
- * Old Value</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getNewValue <em>
- * New Value</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getOldValue
+ * <em>Old Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getNewValue
+ * <em>New Value</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getAttributeOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java
index ee9772a..13ffe0d 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java
@@ -18,6 +18,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#getSubOperations
* <em>Sub Operations</em>}</li>
@@ -28,10 +29,9 @@
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#getCompositeDescription
* <em>Composite Description</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#isReversed <em>
- * Reversed</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#isReversed
+ * <em>Reversed</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getCompositeOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java
index 42bf23f..5c7fc14 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java
@@ -127,6 +127,8 @@
* Returns the '<em><b>Containment Type</b></em>' literal with the specified literal value.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ContainmentType get(String literal) {
@@ -143,6 +145,8 @@
* Returns the '<em><b>Containment Type</b></em>' literal with the specified name.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ContainmentType getByName(String name) {
@@ -159,6 +163,8 @@
* Returns the '<em><b>Containment Type</b></em>' literal with the specified integer value.
* <!-- begin-user-doc --> <!-- end-user-doc -->
*
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static ContainmentType get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java
index 91e9a77..b113308 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java
@@ -22,11 +22,11 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#isDelete <em>
- * Delete</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getModelElement
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#isDelete
+ * <em>Delete</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getModelElement
* <em>Model Element</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getSubOperations
@@ -35,7 +35,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getEObjectToIdMap
* <em>EObject To Id Map</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getCreateDeleteOperation()
* @model
@@ -134,7 +133,8 @@
* @return the value of the '<em>EObject To Id Map</em>' map.
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getCreateDeleteOperation_EObjectToIdMap()
* @model mapType=
- * "org.eclipse.emf.emfstore.internal.server.model.versioning.operations.EObjectToModelElementIdMap<org.eclipse.emf.ecore.EObject, org.eclipse.emf.emfstore.internal.common.model.ModelElementId>"
+ * "org.eclipse.emf.emfstore.internal.server.model.versioning.operations.EObjectToModelElementIdMap<org.eclipse.emf.ecore.EObject,
+ * org.eclipse.emf.emfstore.internal.common.model.ModelElementId>"
* @generated
*/
EMap<EObject, ModelElementId> getEObjectToIdMap();
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java
index 7b146e0..53cc691 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java
@@ -20,13 +20,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ModelElementGroup#getName <em>Name
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ModelElementGroup#getName
+ * <em>Name</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ModelElementGroup#getModelElements
* <em>Model Elements</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getModelElementGroup()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java
index 225f8b5..ac71ff7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java
@@ -16,6 +16,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeMoveOperation#getOldIndex
@@ -27,7 +28,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeMoveOperation#getReferencedValue
* <em>Referenced Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiAttributeMoveOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java
index edc2c7f..cf20c58 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java
@@ -18,16 +18,16 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#isAdd <em>Add
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#isAdd
+ * <em>Add</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#getIndexes
* <em>Indexes</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#getReferencedValues
* <em>Referenced Values</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiAttributeOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java
index c4987db..211ac3f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java
@@ -16,6 +16,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeSetOperation#getIndex
* <em>Index</em>}</li>
@@ -26,7 +27,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeSetOperation#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiAttributeSetOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java
index 9e1a855..af648b8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java
@@ -18,6 +18,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceMoveOperation#getOldIndex
@@ -29,7 +30,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceMoveOperation#getReferencedModelElementId
* <em>Referenced Model Element Id</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiReferenceMoveOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java
index 44bd314..b26cd9b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java
@@ -19,16 +19,16 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#isAdd <em>Add
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#getIndex <em>
- * Index</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#isAdd
+ * <em>Add</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#getIndex
+ * <em>Index</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#getReferencedModelElements
* <em>Referenced Model Elements</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiReferenceOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java
index c3859cd..10a4916 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java
@@ -18,6 +18,7 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceSetOperation#getIndex
* <em>Index</em>}</li>
@@ -28,7 +29,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceSetOperation#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiReferenceSetOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java
index 6c34f6e..b372a96 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java
@@ -1577,8 +1577,8 @@
int CONTAINMENT_TYPE = 17;
/**
- * The meta object id for the '
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.UnsetType <em>Unset Type</em>}' enum.
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.UnsetType
+ * <em>Unset Type</em>}' enum.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
@@ -2715,8 +2715,7 @@
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
- * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.
- * MultiAttributeMoveOperationImpl
+ * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeMoveOperationImpl
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.OperationsPackageImpl#getMultiAttributeMoveOperation()
* @generated
*/
@@ -2863,8 +2862,7 @@
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
- * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.
- * MultiReferenceMoveOperationImpl
+ * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceMoveOperationImpl
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.OperationsPackageImpl#getMultiReferenceMoveOperation()
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java
index cbe2009..f6d4e0c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java
@@ -16,17 +16,16 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#isBidirectional
* <em>Bidirectional</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#getOppositeFeatureName
* <em>Opposite Feature Name</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#getContainmentType
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#getContainmentType
* <em>Containment Type</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getReferenceOperation()
* @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java
index 154e76a..77b6447 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java
@@ -18,13 +18,13 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.SingleReferenceOperation#getOldValue
* <em>Old Value</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.SingleReferenceOperation#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getSingleReferenceOperation()
* @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java
index 58fc631..6ed8274 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java
@@ -132,6 +132,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param literal the literal.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static UnsetType get(String literal) {
@@ -149,6 +151,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param name the name.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static UnsetType getByName(String name) {
@@ -166,6 +170,8 @@
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
*
+ * @param value the integer value.
+ * @return the matching enumerator or <code>null</code>.
* @generated
*/
public static UnsetType get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java
index f19020b..c5cb1bb 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java
@@ -34,18 +34,17 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#getModelElementId
* <em>Model Element Id</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#isAccepted
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#isAccepted
* <em>Accepted</em>}</li>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#getClientDate
* <em>Client Date</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java
index 7838db0..52eff40 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java
@@ -28,6 +28,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AttributeOperationImpl#getOldValue
@@ -36,7 +37,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AttributeOperationImpl#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java
index c04ac48..a056713 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java
@@ -37,6 +37,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CompositeOperationImpl#getSubOperations
@@ -54,7 +55,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CompositeOperationImpl#isReversed
* <em>Reversed</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java
index 12afec5..f012c56 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java
@@ -45,6 +45,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CreateDeleteOperationImpl#isDelete
@@ -59,7 +60,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CreateDeleteOperationImpl#getEObjectToIdMap
* <em>EObject To Id Map</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -93,6 +93,7 @@
collection.clearAllocatedCaches(new LinkedHashSet<ModelElementId>(getEObjectToIdMap().values()));
} else {
+
if (collection.contains(getModelElementId())) {
// silently fail
applySubOperations(collection);
@@ -117,16 +118,13 @@
final EObject copiedChild = copiedAllContainedModelElements.get(i);
final ModelElementId childId = ModelUtil.clone(getEObjectToIdMap().get(child));
- if (ModelUtil.isIgnoredDatatype(child)) {
- continue;
- }
-
if (childId.equals(clone.getModelElementId())) {
clone.setModelElement(copiedChild);
}
clone.getEObjectToIdMap().put(copiedChild, childId);
}
+ // if the element already has been materialized, we don't want to add it
collection.allocateModelElementIds(clone.getEObjectToIdMap().map());
collection.addModelElement(clone.getModelElement());
@@ -365,18 +363,22 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * <!-- begin-user-doc -->
*
- * @generated
+ * @return the {@link EObject} to {@link ModelElementId}-Map
+ * <!-- end-user-doc -->
+ *
+ * @generated NOT
*/
public EMap<EObject, ModelElementId> getEObjectToIdMap() {
if (eObjectToIdMap == null) {
- eObjectToIdMap = new EcoreEMap<EObject, ModelElementId>(
- OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP, EObjectToModelElementIdMapImpl.class, this,
+ eObjectToIdMap = new CreateDeleteOperationEMap(OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP,
+ EObjectToModelElementIdMapImpl.class, this,
OperationsPackage.CREATE_DELETE_OPERATION__EOBJECT_TO_ID_MAP);
}
return eObjectToIdMap;
}
+ // end of custom code
/**
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -587,4 +589,38 @@
}
}
+ /**
+ * Custom {@link EcoreEMap} which avoids the unique checks.
+ */
+ private final class CreateDeleteOperationEMap extends EcoreEMap<EObject, ModelElementId> {
+
+ private static final long serialVersionUID = 4760475977383113249L;
+
+ CreateDeleteOperationEMap(EClass entryEClass, Class<?> entryClass, InternalEObject owner, int featureID) {
+ super(entryEClass, entryClass, owner, featureID);
+ delegateEList = new CreateDeleteOperationEList<Entry<EObject, ModelElementId>>(entryClass, owner,
+ featureID);
+ }
+
+ /**
+ * Custom EList for Map entries.
+ *
+ * @param <E> entry class
+ */
+ protected class CreateDeleteOperationEList<E extends Object & Entry<EObject, ModelElementId>>
+ extends DelegateEObjectContainmentEList<E> {
+
+ private static final long serialVersionUID = 636483596488471965L;
+
+ CreateDeleteOperationEList(Class<?> entryClass, InternalEObject owner, int featureID) {
+ super(entryClass, owner, featureID);
+ }
+
+ @Override
+ protected boolean isUnique() {
+ return false;
+ }
+ }
+ }
+
} // CreateDeleteOperationImpl
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java
index cd84a33..2e41ea3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java
@@ -27,6 +27,7 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.EObjectToModelElementIdMapImpl#getTypedKey
@@ -35,7 +36,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.EObjectToModelElementIdMapImpl#getTypedValue
* <em>Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java
index 980f25f..6238622 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java
@@ -27,6 +27,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ModelElementGroupImpl#getName
* <em>Name</em>}</li>
@@ -34,7 +35,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ModelElementGroupImpl#getModelElements
* <em>Model Elements</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java
index 50e2934..7c1a416 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java
@@ -28,6 +28,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeMoveOperationImpl#getOldIndex
@@ -39,7 +40,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeMoveOperationImpl#getReferencedValue
* <em>Referenced Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java
index 00e31da..75f108a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java
@@ -33,6 +33,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeOperationImpl#isAdd
@@ -44,7 +45,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeOperationImpl#getReferencedValues
* <em>Referenced Values</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java
index a081525..878a869 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java
@@ -29,6 +29,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeSetOperationImpl#getIndex
@@ -40,7 +41,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeSetOperationImpl#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java
index fb784d0..df4e5f1 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java
@@ -35,6 +35,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceMoveOperationImpl#getOldIndex
@@ -46,7 +47,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceMoveOperationImpl#getReferencedModelElementId
* <em>Referenced Model Element Id</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
@@ -178,11 +178,8 @@
referencedModelElementId = (ModelElementId) eResolveProxy(oldReferencedModelElementId);
if (referencedModelElementId != oldReferencedModelElementId) {
final InternalEObject newReferencedModelElementId = (InternalEObject) referencedModelElementId;
- NotificationChain msgs = oldReferencedModelElementId
- .eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE
- - OperationsPackage.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID,
- null, null);
+ NotificationChain msgs = oldReferencedModelElementId.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+ - OperationsPackage.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, null, null);
if (newReferencedModelElementId.eInternalContainer() == null) {
msgs = newReferencedModelElementId.eInverseAdd(this,
EOPPOSITE_FEATURE_BASE
@@ -242,18 +239,12 @@
if (newReferencedModelElementId != referencedModelElementId) {
NotificationChain msgs = null;
if (referencedModelElementId != null) {
- msgs = ((InternalEObject) referencedModelElementId)
- .eInverseRemove(this,
- EOPPOSITE_FEATURE_BASE
- - OperationsPackage.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID,
- null, msgs);
+ msgs = ((InternalEObject) referencedModelElementId).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
+ - OperationsPackage.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, null, msgs);
}
if (newReferencedModelElementId != null) {
- msgs = ((InternalEObject) newReferencedModelElementId)
- .eInverseAdd(this,
- EOPPOSITE_FEATURE_BASE
- - OperationsPackage.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID,
- null, msgs);
+ msgs = ((InternalEObject) newReferencedModelElementId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
+ - OperationsPackage.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, null, msgs);
}
msgs = basicSetReferencedModelElementId(newReferencedModelElementId, msgs);
if (msgs != null) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java
index 1615f59..7584dfc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java
@@ -44,6 +44,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceOperationImpl#isAdd
@@ -55,7 +56,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceOperationImpl#getReferencedModelElements
* <em>Referenced Model Elements</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java
index 517d87b..5850d53 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java
@@ -35,6 +35,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceSetOperationImpl#getIndex
@@ -46,7 +47,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceSetOperationImpl#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java
index 6daa77b..ca2e23a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java
@@ -17,8 +17,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Operation Id</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java
index e3ddd6c..0a5a46f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java
@@ -225,8 +225,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link OperationsPackage#eINSTANCE} when that field is accessed. Clients should
- * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+ * This method is used to initialize {@link OperationsPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
* @see #eNS_URI
@@ -1071,12 +1072,12 @@
initEClass(compositeOperationEClass, CompositeOperation.class, "CompositeOperation", !IS_ABSTRACT, //$NON-NLS-1$
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getCompositeOperation_SubOperations(), getAbstractOperation(), null, "subOperations", null, 0, //$NON-NLS-1$
- -1, CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCompositeOperation_MainOperation(), getAbstractOperation(), null, "mainOperation", null, 0, 1, //$NON-NLS-1$
- CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
- !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompositeOperation_SubOperations(), getAbstractOperation(), null, "subOperations", null, //$NON-NLS-1$
+ 0, -1, CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getCompositeOperation_MainOperation(), getAbstractOperation(), null, "mainOperation", null, //$NON-NLS-1$
+ 0, 1, CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getCompositeOperation_CompositeName(), ecorePackage.getEString(), "compositeName", null, 0, 1, //$NON-NLS-1$
CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
@@ -1103,8 +1104,8 @@
initEReference(getCreateDeleteOperation_ModelElement(), ecorePackage.getEObject(), null, "modelElement", null, //$NON-NLS-1$
0, 1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getCreateDeleteOperation_SubOperations(), getReferenceOperation(), null, "subOperations", null, //$NON-NLS-1$
- 0, -1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+ initEReference(getCreateDeleteOperation_SubOperations(), getReferenceOperation(), null, "subOperations", //$NON-NLS-1$
+ null, 0, -1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getCreateDeleteOperation_EObjectToIdMap(), getEObjectToModelElementIdMap(), null,
"eObjectToIdMap", null, 0, -1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
@@ -1209,8 +1210,8 @@
initEAttribute(getReferenceOperation_OppositeFeatureName(), ecorePackage.getEString(), "oppositeFeatureName", //$NON-NLS-1$
null, 0, 1, ReferenceOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getReferenceOperation_ContainmentType(), getContainmentType(), "containmentType", null, 0, 1, //$NON-NLS-1$
- ReferenceOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ initEAttribute(getReferenceOperation_ContainmentType(), getContainmentType(), "containmentType", null, 0, //$NON-NLS-1$
+ 1, ReferenceOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(operationIdEClass, OperationId.class, "OperationId", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java
index 23ccd4b..582bcac 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java
@@ -23,6 +23,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ReferenceOperationImpl#isBidirectional
@@ -34,7 +35,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ReferenceOperationImpl#getContainmentType
* <em>Containment Type</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java
index 55bd719..3334f9f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java
@@ -38,6 +38,7 @@
* end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.SingleReferenceOperationImpl#getOldValue
@@ -46,7 +47,6 @@
* {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.SingleReferenceOperationImpl#getNewValue
* <em>New Value</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java
index 1d729c9..b46415c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java
@@ -71,8 +71,7 @@
* <!-- begin-user-doc --> <!--
* end-user-doc -->
*
- * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.
- * SemanticCompositeOperationImpl
+ * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticCompositeOperationImpl
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticPackageImpl#getSemanticCompositeOperation()
* @generated
*/
@@ -210,8 +209,7 @@
* <!-- begin-user-doc --> <!--
* end-user-doc -->
*
- * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.
- * SemanticCompositeOperationImpl
+ * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticCompositeOperationImpl
* @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticPackageImpl#getSemanticCompositeOperation()
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java
index 4a990f4..354790c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java
@@ -18,8 +18,6 @@
/**
* <!-- begin-user-doc --> An implementation of the model object ' <em><b>Composite Operation</b></em>'. <!--
* end-user-doc -->
- * <p>
- * </p>
*
* @generated
*/
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java
index a6eefda..ac72577 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java
@@ -76,8 +76,9 @@
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
*
* <p>
- * This method is used to initialize {@link SemanticPackage#eINSTANCE} when that field is accessed. Clients should
- * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+ * This method is used to initialize {@link SemanticPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc
* --> <!-- end-user-doc -->
*
* @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/ChangePackageUtil.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/ChangePackageUtil.java
index 5ea8e7f..5dbde8c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/ChangePackageUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/ChangePackageUtil.java
@@ -16,6 +16,7 @@
import java.io.FileReader;
import java.io.IOException;
import java.io.LineNumberReader;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -27,6 +28,7 @@
import org.apache.commons.io.LineIterator;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.emfstore.internal.common.model.util.FileUtil;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage;
import org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage;
import org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageEnvelope;
@@ -80,109 +82,7 @@
*/
public static Iterator<ChangePackageEnvelope> splitChangePackage(final FileBasedChangePackage changePackage,
final int changePackageFragmentSize) {
-
- return new Iterator<ChangePackageEnvelope>() {
-
- private int fragmentIndex;
- private int count;
- private ChangePackageEnvelope envelope;
- private boolean isInitialized;
-
- public boolean hasNext() {
-
- if (!isInitialized) {
- init();
- }
-
- if (envelope == null) {
- envelope = VersioningFactory.eINSTANCE.createChangePackageEnvelope();
- envelope.setFragmentCount(count);
- }
-
- final List<String> readLines = readLines(fragmentIndex * changePackageFragmentSize, changePackage,
- changePackageFragmentSize);
- envelope.getFragment().addAll(readLines);
-
- envelope.setFragmentIndex(fragmentIndex);
-
- if (!envelope.getFragment().isEmpty() || fragmentIndex == 0) {
- return true;
- }
-
- return false;
- }
-
- private void init() {
- LineNumberReader lineNumberReader = null;
- try {
- lineNumberReader = new LineNumberReader(new FileReader(new File(changePackage.getTempFilePath())));
- lineNumberReader.skip(Long.MAX_VALUE);
- final int lines = lineNumberReader.getLineNumber() + 1;
- count = lines / changePackageFragmentSize;
- if (lines % changePackageFragmentSize != 0) {
- count += 1;
- }
- } catch (final FileNotFoundException ex) {
- throw new IllegalStateException(ex);
- } catch (final IOException ex) {
- throw new IllegalStateException(ex);
- } finally {
- IOUtils.closeQuietly(lineNumberReader);
- }
- isInitialized = true;
- }
-
- private List<String> readLines(int from, final FileBasedChangePackage changePackage,
- final int changePackageFragmentSize) {
-
- int readLines = 0;
- FileReader reader;
- final List<String> lines = new ArrayList<String>();
-
- try {
- reader = new FileReader(new File(changePackage.getTempFilePath()));
- final LineIterator lineIterator = new LineIterator(reader);
- int read = 0;
-
- while (read < from) {
- if (!lineIterator.hasNext()) {
- return lines;
- }
- lineIterator.next();
- read += 1;
- }
-
- while (readLines < changePackageFragmentSize && lineIterator.hasNext()) {
- final String nextLine = lineIterator.next();
- readLines += 1;
- lines.add(nextLine);
- }
-
- } catch (final FileNotFoundException ex) {
- throw new IllegalStateException(ex);
- }
-
- return lines;
- }
-
- public ChangePackageEnvelope next() {
- if (envelope == null) {
- final boolean hasNext = hasNext();
- if (!hasNext) {
- throw new NoSuchElementException();
- }
- }
- final ChangePackageEnvelope ret = envelope;
- envelope = null;
- fragmentIndex += 1;
- return ret;
- }
-
- public void remove() {
- throw new UnsupportedOperationException();
- }
- };
-
+ return new ChangePackageSplittingIterator(changePackageFragmentSize, changePackage);
}
/**
@@ -264,4 +164,126 @@
}
return ret;
}
+
+ /**
+ * Iterator for splitting change packages.
+ *
+ * @author emueller
+ *
+ */
+ private static final class ChangePackageSplittingIterator implements Iterator<ChangePackageEnvelope> {
+ private final int changePackageFragmentSize;
+ private final FileBasedChangePackage changePackage;
+ private int fragmentIndex;
+ private int count;
+ private ChangePackageEnvelope envelope;
+ private boolean isInitialized;
+
+ ChangePackageSplittingIterator(int changePackageFragmentSize, FileBasedChangePackage changePackage) {
+ this.changePackageFragmentSize = changePackageFragmentSize;
+ this.changePackage = changePackage;
+ ModelUtil.logProjectDetails(
+ MessageFormat.format("Splitting change package {0}", changePackage.getFilePath()), null, null, null, //$NON-NLS-1$
+ null, -1);
+ }
+
+ public boolean hasNext() {
+
+ if (!isInitialized) {
+ init();
+ }
+
+ if (envelope == null) {
+ envelope = VersioningFactory.eINSTANCE.createChangePackageEnvelope();
+ envelope.setFragmentCount(count);
+ }
+
+ final List<String> readLines = readLines(fragmentIndex * changePackageFragmentSize, changePackage,
+ changePackageFragmentSize);
+ envelope.getFragment().addAll(readLines);
+
+ envelope.setFragmentIndex(fragmentIndex);
+
+ if (!envelope.getFragment().isEmpty() || fragmentIndex == 0) {
+ ModelUtil.logProjectDetails(MessageFormat.format("Fragment {1} for Change package {0} prepared", //$NON-NLS-1$
+ changePackage.getFilePath(), fragmentIndex), null, null, null, null, -1);
+ return true;
+ }
+
+ ModelUtil.logProjectDetails(
+ MessageFormat.format("No more change package fragments for {0}", changePackage.getFilePath()), null, //$NON-NLS-1$
+ null, null, null, -1);
+ return false;
+ }
+
+ private void init() {
+ LineNumberReader lineNumberReader = null;
+ try {
+ lineNumberReader = new LineNumberReader(new FileReader(new File(changePackage.getTempFilePath())));
+ lineNumberReader.skip(Long.MAX_VALUE);
+ final int lines = lineNumberReader.getLineNumber() + 1;
+ count = lines / changePackageFragmentSize;
+ if (lines % changePackageFragmentSize != 0) {
+ count += 1;
+ }
+ } catch (final FileNotFoundException ex) {
+ throw new IllegalStateException(ex);
+ } catch (final IOException ex) {
+ throw new IllegalStateException(ex);
+ } finally {
+ IOUtils.closeQuietly(lineNumberReader);
+ }
+ isInitialized = true;
+ }
+
+ private List<String> readLines(int from, final FileBasedChangePackage changePackage,
+ final int changePackageFragmentSize) {
+
+ int readLines = 0;
+ FileReader reader;
+ final List<String> lines = new ArrayList<String>();
+
+ try {
+ reader = new FileReader(new File(changePackage.getTempFilePath()));
+ final LineIterator lineIterator = new LineIterator(reader);
+ int read = 0;
+
+ while (read < from) {
+ if (!lineIterator.hasNext()) {
+ return lines;
+ }
+ lineIterator.next();
+ read += 1;
+ }
+
+ while (readLines < changePackageFragmentSize && lineIterator.hasNext()) {
+ final String nextLine = lineIterator.next();
+ readLines += 1;
+ lines.add(nextLine);
+ }
+
+ } catch (final FileNotFoundException ex) {
+ throw new IllegalStateException(ex);
+ }
+
+ return lines;
+ }
+
+ public ChangePackageEnvelope next() {
+ if (envelope == null) {
+ final boolean hasNext = hasNext();
+ if (!hasNext) {
+ throw new NoSuchElementException();
+ }
+ }
+ final ChangePackageEnvelope ret = envelope;
+ envelope = null;
+ fragmentIndex += 1;
+ return ret;
+ }
+
+ public void remove() {
+ throw new UnsupportedOperationException();
+ }
+ }
}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java
index 9d64a05..b5b7102 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java
@@ -481,8 +481,8 @@
}
/**
- * Creates a new adapter for an object of class '{@link java.util.Map.Entry
- * <em>EObject To Model Element Id Map</em>}'.
+ * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EObject To Model Element Id Map</em>
+ * }'.
* <!-- begin-user-doc --> This
* default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java
index 0f732d3..38b3c9f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java
@@ -265,8 +265,8 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec
- * <em>Primary Version Spec</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec <em>Primary Version Spec</em>
+ * }'.
* <!-- begin-user-doc --> This default
* implementation returns null so that we can easily ignore cases; it's
* useful to ignore a case when inheritance will catch all the cases anyway.
@@ -593,8 +593,8 @@
/**
* Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageProxy
- * <em>Change Package Proxy</em>}'.
+ * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageProxy <em>Change Package Proxy</em>
+ * }'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.jdt.ui.prefs
+++ b/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.pde.ds.annotations.prefs b/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.server/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.server/EMFStore Server with ExampleModel.launch b/bundles/org.eclipse.emf.emfstore.server/EMFStore Server with ExampleModel.launch
index 93c88de..06d333f 100644
--- a/bundles/org.eclipse.emf.emfstore.server/EMFStore Server with ExampleModel.launch
+++ b/bundles/org.eclipse.emf.emfstore.server/EMFStore Server with ExampleModel.launch
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<setAttribute key="additional_plugins">
-<setEntry value="org.eclipse.emf.emfstore.internal.examplemodel:0.8.9.M909:default:true"/>
-</setAttribute>
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bad_container_name" value="/emfstore.launch"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/EMFStore Server with ExampleModel"/>
-<booleanAttribute key="default" value="false"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.emf.emfstore.server.server"/>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx524m"/>
-<booleanAttribute key="pde.generated.config" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.emf.emfstore.server.server"/>
-<setAttribute key="selected_features"/>
-<stringAttribute key="selected_target_plugins" value="javax.servlet@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default"/>
-<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="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+<setAttribute key="additional_plugins">
+<setEntry value="org.eclipse.emf.emfstore.internal.examplemodel:0.8.9.M909:default:true"/>
+</setAttribute>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bad_container_name" value="/emfstore.launch"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="false"/>
+<booleanAttribute key="clearws" value="false"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/EMFStore Server with ExampleModel"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.emf.emfstore.server.server"/>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx524m"/>
+<booleanAttribute key="pde.generated.config" value="false"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.emf.emfstore.server.server"/>
+<setAttribute key="selected_features"/>
+<stringAttribute key="selected_target_plugins" value="javax.servlet*3.0.0.v201112011016@default:default,javax.servlet*3.1.0.v201410161800@default:default,javax.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi*3.11.1.v20160708-1632@-1:true,org.eclipse.osgi.services*3.5.100.v20160504-1419@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server@default:default"/>
+<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="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF b/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
index bd318a8..0c302fe 100644
--- a/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.emf.emfstore.server/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Server
Bundle-SymbolicName: org.eclipse.emf.emfstore.server;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: org.eclipse.emf.emfstore.internal.server.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.apache.commons.codec;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.emf.emfstore.server.model;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.migration;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.common;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+Require-Bundle: org.apache.commons.codec;bundle-version="[1.6.0,2.0.0)",
+ org.eclipse.emf.emfstore.server.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.migration;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.common;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
- org.eclipse.emf.emfstore.common.model;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -27,51 +27,51 @@
.parser;version="3.1.3",org.apache.xmlrpc.serializer;version="3.1.3",
org.apache.xmlrpc.server;version="3.1.3",org.apache.xmlrpc.util;versi
on="3.1.3",org.apache.xmlrpc.webserver;version="3.1.3",org.eclipse.em
- f.emfstore.internal.server;version="1.8.1"; x-friends:="org.eclipse.e
+ f.emfstore.internal.server;version="1.9.0"; x-friends:="org.eclipse.e
mf.emfstore.client, org.eclipse.emf.emfstore.client.ui, org.eclipse
.emf.emfstore.client.test.common, org.eclipse.emf.emfstore.server.te
st, org.eclipse.emf.emfstore.test.common, org.eclipse.emf.ecp.emfst
ore.localserver, org.eclipse.emf.ecp.emfstore.ui, org.eclipse.emf.e
mfstore.client.test",org.eclipse.emf.emfstore.internal.server.accessc
- ontrol;version="1.8.1";x-friends:="org.eclipse.emf.emfstore.test.comm
+ ontrol;version="1.9.0";x-friends:="org.eclipse.emf.emfstore.test.comm
on,org.eclipse.emf.emfstore.server.test",org.eclipse.emf.emfstore.int
- ernal.server.accesscontrol.authentication;version="1.8.1";x-friends:=
+ ernal.server.accesscontrol.authentication;version="1.9.0";x-friends:=
"org.eclipse.emf.emfstore.client.test,org.eclipse.emf.emfstore.test.c
ommon",org.eclipse.emf.emfstore.internal.server.accesscontrol.authent
- ication.verifiers;version="1.8.1";x-friends:="org.eclipse.emf.emfstor
+ ication.verifiers;version="1.9.0";x-friends:="org.eclipse.emf.emfstor
e.client.test,org.eclipse.emf.emfstore.server.test",org.eclipse.emf.e
- mfstore.internal.server.conflictDetection;version="1.8.1"; x-friends:
+ mfstore.internal.server.conflictDetection;version="1.9.0"; x-friends:
="org.eclipse.emf.emfstore.client, org.eclipse.emf.emfstore.client.t
est, org.eclipse.emf.emfstore.client.ui, org.eclipse.emf.emfstore.c
lient.conflictdetection.test, org.eclipse.emf.emfstore.test.common",
- org.eclipse.emf.emfstore.internal.server.connection;version="1.8.1";x
+ org.eclipse.emf.emfstore.internal.server.connection;version="1.9.0";x
-friends:="org.eclipse.emf.emfstore.server.test",org.eclipse.emf.emfs
- tore.internal.server.connection.xmlrpc;version="1.8.1";x-friends:="or
+ tore.internal.server.connection.xmlrpc;version="1.9.0";x-friends:="or
g.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.test.common",o
rg.eclipse.emf.emfstore.internal.server.connection.xmlrpc.util;versio
- n="1.8.1";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf
+ n="1.9.0";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf
.emfstore.test.common",org.eclipse.emf.emfstore.internal.server.core;
- version="1.8.1";x-friends:="org.eclipse.emf.emfstore.test.common",org
- .eclipse.emf.emfstore.internal.server.core.helper;version="1.8.1";x-i
+ version="1.9.0";x-friends:="org.eclipse.emf.emfstore.test.common",org
+ .eclipse.emf.emfstore.internal.server.core.helper;version="1.9.0";x-i
nternal:=true,org.eclipse.emf.emfstore.internal.server.core.subinterf
- aces;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.intern
- al.server.exceptions;version="1.8.1"; x-friends:="org.eclipse.emf.emf
+ aces;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.intern
+ al.server.exceptions;version="1.9.0"; x-friends:="org.eclipse.emf.emf
store.client, org.eclipse.emf.emfstore.client.test.common, org.ecli
pse.emf.emfstore.client.test.ui, org.eclipse.emf.emfstore.client.ui,
org.eclipse.emf.emfstore.example.merging, org.eclipse.emf.emfstore
.test.common, org.eclipse.emf.emfstore.server.test, org.eclipse.emf
.ecp.emfstore.ui, org.eclipse.emf.emfstore.client.api.test",org.ecli
- pse.emf.emfstore.internal.server.filetransfer;version="1.8.1";x-frien
+ pse.emf.emfstore.internal.server.filetransfer;version="1.9.0";x-frien
ds:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfstore.test.co
- mmon",org.eclipse.emf.emfstore.internal.server.impl.api;version="1.8.
- 1";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfsto
+ mmon",org.eclipse.emf.emfstore.internal.server.impl.api;version="1.9.
+ 0";x-friends:="org.eclipse.emf.emfstore.client,org.eclipse.emf.emfsto
re.client.ui",org.eclipse.emf.emfstore.internal.server.startup;versio
- n="1.8.1";x-friends:="org.eclipse.emf.emfstore.client",org.eclipse.em
- f.emfstore.internal.server.storage;version="1.8.1";x-internal:=true,o
- rg.eclipse.emf.emfstore.server;version="1.8.1",org.eclipse.emf.emfsto
- re.server.auth;version="1.8.1",org.eclipse.emf.emfstore.server.except
- ions;version="1.8.1",org.eclipse.emf.emfstore.server.observer;version
- ="1.8.1"
+ n="1.9.0";x-friends:="org.eclipse.emf.emfstore.client",org.eclipse.em
+ f.emfstore.internal.server.storage;version="1.9.0";x-internal:=true,o
+ rg.eclipse.emf.emfstore.server;version="1.9.0",org.eclipse.emf.emfsto
+ re.server.auth;version="1.9.0",org.eclipse.emf.emfstore.server.except
+ ions;version="1.9.0",org.eclipse.emf.emfstore.server.observer;version
+ ="1.9.0"
Bundle-ActivationPolicy: lazy
Import-Package: javax.servlet;version="[2.0.0,4.0.0)";resolution:=optional,
javax.servlet.http;version="[2.0.0,4.0.0)";resolution:=optional,
diff --git a/bundles/org.eclipse.emf.emfstore.server/pom.xml b/bundles/org.eclipse.emf.emfstore.server/pom.xml
index 2d8bb42..5c25a1f 100644
--- a/bundles/org.eclipse.emf.emfstore.server/pom.xml
+++ b/bundles/org.eclipse.emf.emfstore.server/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.bundles</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.server</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd b/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd
index bcf693d..69cf4b2 100644
--- a/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd
+++ b/bundles/org.eclipse.emf.emfstore.server/schema/accessControl.exsd
@@ -22,6 +22,7 @@
<element ref="authorizationServiceProvider" minOccurs="0" maxOccurs="1"/>
<element ref="userVerifierServiceProvider" minOccurs="0" maxOccurs="1"/>
<element ref="orgUnitProvider" minOccurs="0" maxOccurs="1"/>
+ <element ref="passwordHashGenerator" minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
@@ -110,6 +111,21 @@
</complexType>
</element>
+ <element name="passwordHashGenerator">
+ <complexType>
+ <attribute name="passwordHashGeneratorClass" type="string">
+ <annotation>
+ <documentation>
+ A PasswordHash Generator is able to generate a hash using a newly created salt for a given password. Moreover it is able to verify if a password matches a stored hash/salt.
+ </documentation>
+ <appInfo>
+ <meta.attribute kind="java" basedOn=":org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
<annotation>
<appInfo>
<meta.section type="since"/>
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java
index 04f79fb..9137dc6 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java
@@ -146,6 +146,8 @@
*
* @param sessionId
* the {@link SessionId} for authentication purposes
+ * @param projectId
+ * the {@link ProjectId} for access control purposes
* @param proxyId
* the ID of the change package proxy that is used to identify available fragments
* @param fragmentIndex
@@ -153,8 +155,9 @@
* @return a {@link ChangePackageEnvelope} containing the requested change package fragment
* @throws ESException in case the fragment could not be fetched
*/
- ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, String proxyId, int fragmentIndex)
- throws ESException;
+ ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, ProjectId projectId, String proxyId,
+ int fragmentIndex)
+ throws ESException;
/**
* Resolve a version specified to a primary version specifier.
@@ -192,7 +195,7 @@
*/
List<AbstractChangePackage> getChanges(SessionId sessionId, ProjectId projectId, VersionSpec source,
VersionSpec target)
- throws ESException;
+ throws ESException;
/**
* Lista all branches of the given project.
@@ -421,7 +424,7 @@
* there were more recent versions of these properties on the server
* @throws ESException
* if any error occurs in the EmfStore
- * */
+ */
List<EMFStoreProperty> setEMFProperties(SessionId sessionId, List<EMFStoreProperty> property, ProjectId projectId)
throws ESException;
@@ -438,7 +441,7 @@
* @throws ESException
* if any error occurs in the EmfStore
*
- * **/
+ **/
List<EMFStoreProperty> getEMFProperties(SessionId sessionId, ProjectId projectId) throws ESException;
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStoreController.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStoreController.java
index e068401..64efd22 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStoreController.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStoreController.java
@@ -15,6 +15,8 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -23,6 +25,7 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Properties;
+import java.util.Scanner;
import java.util.Set;
import org.eclipse.core.runtime.ILogListener;
@@ -51,6 +54,7 @@
import org.eclipse.emf.emfstore.internal.server.core.helper.ResourceHelper;
import org.eclipse.emf.emfstore.internal.server.exceptions.FatalESException;
import org.eclipse.emf.emfstore.internal.server.exceptions.StorageException;
+import org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo;
import org.eclipse.emf.emfstore.internal.server.model.ModelFactory;
import org.eclipse.emf.emfstore.internal.server.model.ProjectHistory;
import org.eclipse.emf.emfstore.internal.server.model.ServerSpace;
@@ -68,6 +72,8 @@
import org.eclipse.emf.emfstore.internal.server.storage.ServerXMIResourceSetProvider;
import org.eclipse.emf.emfstore.server.ESDynamicModelProvider;
import org.eclipse.emf.emfstore.server.ESServerURIUtil;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt;
import org.eclipse.emf.emfstore.server.exceptions.ESServerInitException;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;
@@ -147,7 +153,9 @@
Messages.EMFStoreController_Could_Not_Copy_Properties_File,
Messages.EMFStoreController_Default_Properties_File_Copied);
- initProperties();
+ final Properties properties = initProperties();
+
+ assureSuperUserPasswordIsSet(properties);
logGeneralInformation();
@@ -177,6 +185,10 @@
handlePostStartupListener();
registerShutdownHook();
+ if (ServerConfiguration.isUserPasswordMigrationRequired()) {
+ performDummyLogin();
+ }
+
ModelUtil.logInfo(Messages.EMFStoreController_Init_Complete);
ModelUtil.logInfo(Messages.EMFStoreController_Server_Running);
if (waitForTermination) {
@@ -185,6 +197,15 @@
}
+ /**
+ * Verify a dummy user in order to trigger an eager startup of the user verifiers.
+ */
+ private void performDummyLogin() {
+ final ClientVersionInfo clientVersionInfo = ModelFactory.eINSTANCE.createClientVersionInfo();
+ clientVersionInfo.setVersion("1.0.0."); //$NON-NLS-1$ // actual version is unimportant
+ getAccessControl().getLoginService().verifyUser("", "", clientVersionInfo.toAPI()); //$NON-NLS-1$//$NON-NLS-2$
+ }
+
private void registerShutdownHook() {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
@@ -458,6 +479,73 @@
ModelUtil.logInfo(Messages.EMFStoreController_Added_SuperUser + superuser);
}
+ private void assureSuperUserPasswordIsSet(final Properties properties) {
+
+ final boolean unhashedPasswordWasPresent = properties.containsKey(ServerConfiguration.SUPER_USER_PASSWORD);
+
+ String password = null;
+ if (!unhashedPasswordWasPresent) {
+
+ if (properties.containsKey(ServerConfiguration.SUPER_USER_PASSWORD_HASH) &&
+ properties.containsKey(ServerConfiguration.SUPER_USER_PASSWORD_SALT)) {
+ /* super user password not present but hash and salt -> all is fine */
+ return;
+ }
+
+ /* no password is available in properties -> get password from user */
+ final Scanner scanner = new Scanner(System.in);
+ try {
+ boolean passwordDidNotMatch = true;
+ while (passwordDidNotMatch) {
+ System.out.println(Messages.EMFStoreController_NoSuperUserPasswordPrompt);
+ final String pw1 = scanner.nextLine();
+ System.out.println(Messages.EMFStoreController_EnterSuperUserPasswordAgain);
+ final String pw2 = scanner.nextLine();
+ if (pw1 != null && pw1.equals(pw2)) {
+ password = pw1;
+ passwordDidNotMatch = false;
+ } else {
+ System.out.println(Messages.EMFStoreController_PasswordDidNotMatch);
+ }
+ }
+ } finally {
+ scanner.close();
+ }
+ } else {
+ /* get unhashed password */
+ password = properties.getProperty(ServerConfiguration.SUPER_USER_PASSWORD);
+ }
+
+ /* migrate non hashed password */
+ final ESPasswordHashGenerator passwordHashGenerator = AccessControl.getESPasswordHashGenerator();
+ final File propertyFile = new File(ServerConfiguration.getConfFile());
+ FileOutputStream propertyFileOutputStream = null;
+ try {
+ propertyFileOutputStream = new FileOutputStream(propertyFile);
+ final ESHashAndSalt hashAndSalt = passwordHashGenerator.hashPassword(password);
+ properties.setProperty(ServerConfiguration.SUPER_USER_PASSWORD_SALT, hashAndSalt.getSalt());
+ properties.setProperty(ServerConfiguration.SUPER_USER_PASSWORD_HASH, hashAndSalt.getHash());
+ properties.remove(ServerConfiguration.SUPER_USER_PASSWORD);
+ properties.store(propertyFileOutputStream, ""); //$NON-NLS-1$
+ } catch (final FileNotFoundException ex) {
+ ModelUtil.logWarning(Messages.EMFStoreController_PasswordHashFailFileNotFound, ex);
+ } catch (final IOException ex) {
+ ModelUtil.logWarning(Messages.EMFStoreController_PasswordHashFailIOException, ex);
+ } finally {
+ if (propertyFileOutputStream != null) {
+ try {
+ propertyFileOutputStream.close();
+ } catch (final IOException ex) {
+ ModelUtil.logException(ex);
+ }
+ }
+ }
+
+ if (unhashedPasswordWasPresent) {
+ ServerConfiguration.initUserVerifierMigration();
+ }
+ }
+
private Properties initProperties() {
final File propertyFile = new File(ServerConfiguration.getConfFile());
final Properties properties = new Properties();
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/Messages.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/Messages.java
index 7def488..b461af1 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/Messages.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/Messages.java
@@ -34,11 +34,16 @@
public static String EMFStoreController_Default_Properties_File_Copied;
public static String EMFStoreController_Dynamic_Model_Loaded;
public static String EMFStoreController_EMFStore_Controller_Already_Running;
+ public static String EMFStoreController_EnterSuperUserPasswordAgain;
public static String EMFStoreController_Error_During_Migration;
public static String EMFStoreController_Failed_To_Copy_Keystore;
public static String EMFStoreController_Init_Complete;
public static String EMFStoreController_JVM_Max_Memory;
public static String EMFStoreController_Keystore_Copied;
+ public static String EMFStoreController_NoSuperUserPasswordPrompt;
+ public static String EMFStoreController_PasswordDidNotMatch;
+ public static String EMFStoreController_PasswordHashFailFileNotFound;
+ public static String EMFStoreController_PasswordHashFailIOException;
public static String EMFStoreController_Property_Init_Failed;
public static String EMFStoreController_PropertyFile_Read;
public static String EMFStoreController_Serve_Forcefully_Stopped;
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/ServerConfiguration.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/ServerConfiguration.java
index a3c1d65..395ff49 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/ServerConfiguration.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/ServerConfiguration.java
@@ -194,6 +194,16 @@
public static final String SUPER_USER_PASSWORD = "emfstore.accesscontrol.authentication.superuser.password"; //$NON-NLS-1$
/**
+ * Property for the super user's password hash.
+ */
+ public static final String SUPER_USER_PASSWORD_HASH = "emfstore.accesscontrol.authentication.superuser.password.hash"; //$NON-NLS-1$
+
+ /**
+ * Property for the super user's password salt.
+ */
+ public static final String SUPER_USER_PASSWORD_SALT = "emfstore.accesscontrol.authentication.superuser.password.salt"; //$NON-NLS-1$
+
+ /**
* Default super user password.
*/
public static final String SUPER_USER_PASSWORD_DEFAULT = "super"; //$NON-NLS-1$
@@ -387,6 +397,8 @@
private static Boolean useFileBasedChangePackageOnServer;
private static Boolean saveProjectStateOnTag;
+ private static boolean migrateUserPasswords;
+
/**
* Return the server home directory location.
*
@@ -734,4 +746,21 @@
}
return saveProjectStateOnTag;
}
+
+ /**
+ * Sets {@link #isUserPasswordMigrationRequired()} to <code>true</code>.
+ */
+ static void initUserVerifierMigration() {
+ ServerConfiguration.migrateUserPasswords = true;
+ }
+
+ /**
+ *
+ * @return <code>true</code> if the super user password was migrated from clear text to hashed property. In this
+ * case user verifiers should hash their user password as well. <code>false</code> if no migration is
+ * needed.
+ */
+ public static boolean isUserPasswordMigrationRequired() {
+ return ServerConfiguration.migrateUserPasswords;
+ }
}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java
index 9c164ca..187e581 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java
@@ -24,6 +24,7 @@
import org.eclipse.emf.emfstore.server.auth.ESAuthenticationControlType;
import org.eclipse.emf.emfstore.server.auth.ESAuthorizationService;
import org.eclipse.emf.emfstore.server.auth.ESOrgUnitResolver;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
import org.eclipse.emf.emfstore.server.auth.ESSessions;
import org.eclipse.emf.emfstore.server.model.ESOrgUnitProvider;
@@ -41,8 +42,12 @@
private static final String AUTHORIZATION_SERVICE_CLASS = "authorizationServiceClass"; //$NON-NLS-1$
+ private static final String PASSWORD_HASH_GENERATOR_CLASS = "passwordHashGeneratorClass"; //$NON-NLS-1$
+
private static final String ACCESSCONTROL_EXTENSION_ID = "org.eclipse.emf.emfstore.server.accessControl"; //$NON-NLS-1$
+ private static ESPasswordHashGenerator passwordHashGenerator;
+
private final ESOrgUnitProvider orgUnitProvider;
private final ESAuthorizationService authorizationService;
@@ -95,6 +100,38 @@
}
/**
+ * Parses the access control extension point and return the {@link ESPasswordHashGenerator} if found.
+ *
+ * @return the generator
+ */
+ public static ESPasswordHashGenerator getESPasswordHashGenerator() {
+ if (AccessControl.passwordHashGenerator != null) {
+ return AccessControl.passwordHashGenerator;
+ }
+ ESPasswordHashGenerator passwordHashGenerator;
+ try {
+ final List<ESPasswordHashGenerator> services = new ESExtensionPoint(ACCESSCONTROL_EXTENSION_ID, false)
+ .getClasses(PASSWORD_HASH_GENERATOR_CLASS, ESPasswordHashGenerator.class);
+ if (services.isEmpty()) {
+ passwordHashGenerator = new DefaultESPasswordHashGenerator();
+ } else if (services.size() == 1) {
+ passwordHashGenerator = services.get(0);
+ } else {
+ throw new IllegalStateException(
+ MessageFormat.format(
+ Messages.AccessControl_MultipleExtensionsDiscovered,
+ ACCESSCONTROL_EXTENSION_ID + "." + PASSWORD_HASH_GENERATOR_CLASS)); //$NON-NLS-1$
+ }
+ } catch (final ESExtensionPointException e) {
+ final String message = Messages.AccessControl_CustomAuthorizationInitFailed;
+ ModelUtil.logException(message, e);
+ passwordHashGenerator = new DefaultESPasswordHashGenerator();
+ }
+ AccessControl.passwordHashGenerator = passwordHashGenerator;
+ return passwordHashGenerator;
+ }
+
+ /**
* @return
*/
private LoginService initLoginService() {
@@ -158,7 +195,7 @@
MessageFormat.format(
Messages.AccessControl_MultipleExtensionsDiscovered,
ACCESSCONTROL_EXTENSION_ID + "." + ORG_UNIT_RESOLVER_SERVICE_CLASS //$NON-NLS-1$
- ));
+ ));
}
} catch (final ESExtensionPointException e) {
final String message = "Custom org unit resolver class not be initialized"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java
index dd122df..0169791 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java
@@ -235,7 +235,7 @@
*/
public boolean checkProjectAdminAccessForOrgUnit(ESSessionId sessionId, ESOrgUnitId orgUnitId,
Set<ESGlobalProjectId> projectIds)
- throws AccessControlException {
+ throws AccessControlException {
checkSession(sessionId);
cleanupPARole(orgUnitId);
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESOrgUnitResolverService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESOrgUnitResolverService.java
index e78dce1..9986f99 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESOrgUnitResolverService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESOrgUnitResolverService.java
@@ -126,7 +126,7 @@
/**
* {@inheritDoc}
- *
+ *
* @throws AccessControlException
*
* @see org.eclipse.emf.emfstore.server.auth.ESOrgUnitResolver#getGroups(org.eclipse.emf.emfstore.server.model.ESOrgUnitId)
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESPasswordHashGenerator.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESPasswordHashGenerator.java
new file mode 100644
index 0000000..ef482be
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESPasswordHashGenerator.java
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.internal.server.accesscontrol;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.RandomStringUtils;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
+
+/**
+ * Default implemention of the {@link ESPasswordHashGenerator} using a 128 char String as a salt and SHA512 as a hash
+ * function.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+public class DefaultESPasswordHashGenerator implements ESPasswordHashGenerator {
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator#hashPassword(java.lang.String)
+ */
+ public ESHashAndSalt hashPassword(String password) {
+ final String salt = RandomStringUtils.randomAlphanumeric(128);
+ final String hash = createHash(password, salt);
+ return org.eclipse.emf.emfstore.server.auth.ESHashAndSalt.create(hash, salt);
+ }
+
+ private String createHash(String password, final String salt) {
+ String hash = DigestUtils.sha512Hex(password + salt);
+ for (int i = 0; i < 128; i++) {
+ if (i % 2 == 0) {
+ hash = DigestUtils.sha512Hex(hash + salt);
+ } else {
+ hash = DigestUtils.sha512Hex(salt + hash);
+ }
+ }
+ return hash;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator#verifyPassword(java.lang.String,
+ * java.lang.String, java.lang.String)
+ */
+ public boolean verifyPassword(String password, String hash, String salt) {
+ if (password == null || hash == null || salt == null) {
+ return false;
+ }
+ final String hashToMatch = createHash(password, salt);
+ return hash.equals(hashToMatch);
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/HasRolePredicate.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/HasRolePredicate.java
index 5b22de9..6d7c604 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/HasRolePredicate.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/HasRolePredicate.java
@@ -36,7 +36,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see com.google.common.base.Predicate#apply(java.lang.Object)
*/
public boolean apply(final Role role) {
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java
index 4e1f30f..bafbd73 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java
@@ -118,7 +118,7 @@
*/
public ESAuthenticationInformation logIn(String username, String password,
ESClientVersionInfo clientVersionInfo)
- throws AccessControlException {
+ throws AccessControlException {
synchronized (MonitorProvider.getInstance().getMonitor(MONITOR_NAME)) {
final ESAuthenticationInformation authInfo = getUserVerifierService().verifyUser(
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/EMFModelUserVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/EMFModelUserVerifier.java
index 7d5e9a7..610c1c8 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/EMFModelUserVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/EMFModelUserVerifier.java
@@ -11,9 +11,18 @@
******************************************************************************/
package org.eclipse.emf.emfstore.internal.server.accesscontrol.authentication.verifiers;
+import java.io.IOException;
+import java.util.Set;
+
import org.apache.commons.lang.StringUtils;
+import org.eclipse.emf.emfstore.internal.common.APIUtil;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
+import org.eclipse.emf.emfstore.internal.server.ServerConfiguration;
+import org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl;
import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACUser;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt;
import org.eclipse.emf.emfstore.server.model.ESOrgUnitProvider;
/**
@@ -30,6 +39,28 @@
*/
public EMFModelUserVerifier(ESOrgUnitProvider orgUnitProvider) {
super(orgUnitProvider);
+ migrateToHashedPasswordIfNeeded(orgUnitProvider);
+
+ }
+
+ private void migrateToHashedPasswordIfNeeded(ESOrgUnitProvider orgUnitProvider) {
+ if (!ServerConfiguration.isUserPasswordMigrationRequired()) {
+ return;
+ }
+ final ESPasswordHashGenerator passwordHashGenerator = AccessControl.getESPasswordHashGenerator();
+ final Set<ACUser> users = APIUtil.toInternal(orgUnitProvider.getUsers());
+ for (final ACUser user : users) {
+ if (user.getPassword() == null) {
+ continue;
+ }
+ final ESHashAndSalt hashAndSalt = passwordHashGenerator.hashPassword(user.getPassword());
+ user.setPassword(hashAndSalt.getHash() + ESHashAndSalt.SEPARATOR + hashAndSalt.getSalt());
+ }
+ try {
+ orgUnitProvider.save();
+ } catch (final IOException ex) {
+ ModelUtil.logException("Migration of user passwords failed", ex); //$NON-NLS-1$
+ }
}
/**
@@ -59,13 +90,18 @@
return false;
}
- return userPassword.equals(password);
+ final ESPasswordHashGenerator passwordHashGenerator = AccessControl.getESPasswordHashGenerator();
+ final int separatorIndex = userPassword.indexOf(ESHashAndSalt.SEPARATOR);
+ final String hash = userPassword.substring(0, separatorIndex);
+ final String salt = userPassword.substring(separatorIndex + 1);
+ return passwordHashGenerator.verifyPassword(password, hash, salt);
+
}
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.server.auth.ESUserVerifier#init(org.eclipse.emf.emfstore.server.model.ESOrgUnitProvider)
*/
public void init(ESOrgUnitProvider orgUnitProvider) {
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/PasswordVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/PasswordVerifier.java
index 09f772d..8cf9730 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/PasswordVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/PasswordVerifier.java
@@ -13,12 +13,14 @@
package org.eclipse.emf.emfstore.internal.server.accesscontrol.authentication.verifiers;
import org.eclipse.emf.emfstore.internal.server.ServerConfiguration;
+import org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl;
import org.eclipse.emf.emfstore.internal.server.connection.ServerKeyStoreManager;
import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
import org.eclipse.emf.emfstore.internal.server.exceptions.ClientVersionOutOfDateException;
import org.eclipse.emf.emfstore.internal.server.exceptions.ServerKeyStoreException;
import org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation;
import org.eclipse.emf.emfstore.internal.server.model.ModelFactory;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
import org.eclipse.emf.emfstore.server.auth.ESUserVerifier;
import org.eclipse.emf.emfstore.server.model.ESClientVersionInfo;
@@ -30,7 +32,8 @@
public abstract class PasswordVerifier implements ESUserVerifier {
private final String superuser;
- private final String superuserpw;
+ private final String hash;
+ private final String salt;
/**
* Default constructor.
@@ -38,8 +41,8 @@
public PasswordVerifier() {
superuser = ServerConfiguration.getProperties().getProperty(ServerConfiguration.SUPER_USER,
ServerConfiguration.SUPER_USER_DEFAULT);
- superuserpw = ServerConfiguration.getProperties().getProperty(ServerConfiguration.SUPER_USER_PASSWORD,
- ServerConfiguration.SUPER_USER_PASSWORD_DEFAULT);
+ hash = ServerConfiguration.getProperties().getProperty(ServerConfiguration.SUPER_USER_PASSWORD_HASH);
+ salt = ServerConfiguration.getProperties().getProperty(ServerConfiguration.SUPER_USER_PASSWORD_SALT);
}
/**
@@ -75,7 +78,11 @@
* @return true if super user
*/
protected boolean verifySuperUser(String username, String password) {
- return username.equals(superuser) && password.equals(superuserpw);
+ final ESPasswordHashGenerator passwordHashGenerator = AccessControl.getESPasswordHashGenerator();
+ if (hash == null && salt == null) {
+ return username.equals(superuser) && ServerConfiguration.SUPER_USER_PASSWORD_DEFAULT.equals(password);
+ }
+ return username.equals(superuser) && passwordHashGenerator.verifyPassword(password, hash, salt);
}
/**
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/SimplePropertyFileUserVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/SimplePropertyFileUserVerifier.java
index f8e81b1..e16f0b7 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/SimplePropertyFileUserVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/SimplePropertyFileUserVerifier.java
@@ -156,7 +156,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.server.auth.ESUserVerifier#init(org.eclipse.emf.emfstore.server.model.ESOrgUnitProvider)
*/
public void init(ESOrgUnitProvider orgUnitProvider) {
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java
index 84fc2c2..d536c74 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifier.java
@@ -64,16 +64,24 @@
checkClientVersion(clientVersionInfo);
final String preparedPassword = preparePassword(password);
+ final String superUser = ServerConfiguration.getProperties()
+ .getProperty(ServerConfiguration.SUPER_USER, ServerConfiguration.SUPER_USER_DEFAULT);
- if (verifySuperUser(username, preparedPassword) || verifyPassword(username, preparedPassword)) {
- final AuthenticationInformation createAuthenticationInfo = createAuthenticationInfo();
- createAuthenticationInfo.setResolvedACUser(ModelUtil.clone(findUser(username)));
- return createAuthenticationInfo.toAPI();
+ if (verifySuperUser(username, preparedPassword)) {
+ return createAuthInfo(username);
+ } else if (!username.equals(superUser) && verifyPassword(username, preparedPassword)) {
+ return createAuthInfo(username);
}
throw new AccessControlException();
}
+ private ESAuthenticationInformation createAuthInfo(String username) throws AccessControlException {
+ final AuthenticationInformation createAuthenticationInfo = createAuthenticationInfo();
+ createAuthenticationInfo.setResolvedACUser(ModelUtil.clone(findUser(username)));
+ return createAuthenticationInfo.toAPI();
+ }
+
/**
* Find the user with the given user name.
*
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifierChain.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifierChain.java
index 9e10c4e..4f0fb6c 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifierChain.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/authentication/verifiers/UserVerifierChain.java
@@ -68,7 +68,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.server.auth.ESUserVerifier#init(org.eclipse.emf.emfstore.server.model.ESOrgUnitProvider)
*/
public void init(ESOrgUnitProvider orgUnitProvider) {
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java
index 5b13e26..3cfd409 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java
@@ -87,7 +87,7 @@
|| reservationToConflictMap.hasFullReservation(modelElement)) {
final ConflictBucketCandidate mergedConflictBucketCandidates = mergeConflictBucketCandidates(
reservationToConflictMap
- .getConflictBucketCandidates(modelElement),
+ .getConflictBucketCandidates(modelElement),
currentConflictBucketCandidate);
reservationToConflictMap.addFullReservation(modelElement, mergedConflictBucketCandidates);
continue;
@@ -153,11 +153,11 @@
final ConflictBucketCandidate mergedConflictBucketCandidates = mergeConflictBucketCandidates(
reservationToConflictMap
- .getConflictBucketCandidates(
- modelElement,
- featureName,
- oppositeModelElement),
- currentConflictBucketCandidate);
+ .getConflictBucketCandidates(
+ modelElement,
+ featureName,
+ oppositeModelElement),
+ currentConflictBucketCandidate);
reservationToConflictMap.addMultiReferenceWithOppositeReservation(
modelElement,
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
index 048b7f7..f4dc2fe 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl;
import org.eclipse.emf.emfstore.internal.server.connection.xmlrpc.util.ShareProjectAdapter;
import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
+import org.eclipse.emf.emfstore.internal.server.exceptions.FileNotOnServerException;
import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidVersionSpecException;
import org.eclipse.emf.emfstore.internal.server.filetransfer.FileChunk;
import org.eclipse.emf.emfstore.internal.server.filetransfer.FileTransferInformation;
@@ -153,7 +154,11 @@
public FileChunk downloadFileChunk(SessionId sessionId, ProjectId projectId,
FileTransferInformation fileInformation)
throws ESException {
- return getEmfStore().downloadFileChunk(sessionId, projectId, fileInformation);
+ try {
+ return getEmfStore().downloadFileChunk(sessionId, projectId, fileInformation);
+ } catch (final FileNotOnServerException ex) {
+ return null;
+ }
}
/**
@@ -303,15 +308,16 @@
}
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.server.EMFStore#downloadChangePackageFragment(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * java.lang.String, int)
+ * org.eclipse.emf.emfstore.internal.server.model.ProjectId, java.lang.String, int)
*/
- public ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, String proxyId, int fragmentIndex)
- throws ESException {
- return getEmfStore().downloadChangePackageFragment(sessionId, proxyId, fragmentIndex);
+ public ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, ProjectId projectId, String proxyId,
+ int fragmentIndex)
+ throws ESException {
+ return getEmfStore().downloadChangePackageFragment(sessionId, projectId, proxyId, fragmentIndex);
}
}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectDeserializer.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectDeserializer.java
index 3d564ad..22e1425 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectDeserializer.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectDeserializer.java
@@ -98,13 +98,11 @@
final Map<String, EObject> idToEObjectMap = new LinkedHashMap<String, EObject>();
for (final EObject modelElement : collection.getAllModelElements()) {
- String modelElementId;
- if (ModelUtil.isIgnoredDatatype(modelElement)) {
+ String modelElementId = res.getID(modelElement);
+ if (modelElementId == null) {
// create random ID for generic types, won't get serialized
// anyway
modelElementId = ModelFactory.eINSTANCE.createModelElementId().getId();
- } else {
- modelElementId = res.getID(modelElement);
}
if (modelElementId == null) {
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java
index fba7827..292501b 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java
@@ -139,10 +139,10 @@
private void setResourceIds(EObject eObject, XMIResource resource) {
final IdEObjectCollection collection = (IdEObjectCollection) eObject;
for (final EObject element : collection.getAllModelElements()) {
- if (ModelUtil.isIgnoredDatatype(element)) {
+ final ModelElementId elementId = collection.getModelElementId(element);
+ if (elementId == null) {
continue;
}
- final ModelElementId elementId = collection.getModelElementId(element);
resource.setID(element, elementId.getId());
}
}
@@ -205,4 +205,3 @@
serializationOptionsInitialized = true;
}
}
-
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java
index 17b356a..a0b9067 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java
@@ -216,7 +216,7 @@
*/
protected synchronized void checkProjectAdminAccess(SessionId sessionId, ProjectId projectId,
ESProjectAdminPrivileges privilege)
- throws AccessControlException {
+ throws AccessControlException {
if (accessControlDisabled) {
return;
}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java
index 12863ea..87b16f6 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java
@@ -48,6 +48,8 @@
import org.eclipse.emf.emfstore.internal.server.model.impl.api.ESGroupImpl;
import org.eclipse.emf.emfstore.internal.server.model.impl.api.ESUserImpl;
import org.eclipse.emf.emfstore.server.auth.ESAuthorizationService;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt;
import org.eclipse.emf.emfstore.server.auth.ESProjectAdminPrivileges;
import org.eclipse.emf.emfstore.server.exceptions.ESException;
import org.eclipse.emf.emfstore.server.model.ESGroup;
@@ -74,7 +76,7 @@
*/
public AdminEmfStoreImpl(ServerSpace serverSpace,
AccessControl accessControl)
- throws FatalESException {
+ throws FatalESException {
super(serverSpace, accessControl);
}
@@ -541,7 +543,7 @@
if (!isServerAdmin && role.canAdministrate(resolvedProjectId)) {
throw new AccessControlException(
Messages.AdminEmfStoreImpl_RemovePA_Violation_1
- + Messages.AdminEmfStoreImpl_RemovePA_Violation_2);
+ + Messages.AdminEmfStoreImpl_RemovePA_Violation_2);
}
role.getProjects().remove(resolvedProjectId);
@@ -783,7 +785,9 @@
final ACUser user = (ACUser) getOrgUnit(userId);
user.setName(name);
- user.setPassword(password);
+ final ESPasswordHashGenerator passwordHashGenerator = AccessControl.getESPasswordHashGenerator();
+ final ESHashAndSalt hashAndSalt = passwordHashGenerator.hashPassword(password);
+ user.setPassword(hashAndSalt.getHash() + ESHashAndSalt.SEPARATOR + hashAndSalt.getSalt());
save();
}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/helper/ResourceHelper.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/helper/ResourceHelper.java
index 8e40e42..7a008eb 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/helper/ResourceHelper.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/helper/ResourceHelper.java
@@ -13,9 +13,6 @@
import java.io.File;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.EObject;
@@ -33,11 +30,7 @@
import org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage;
import org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec;
import org.eclipse.emf.emfstore.internal.server.model.versioning.Version;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation;
-import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CreateDeleteOperationImpl;
import org.eclipse.emf.emfstore.internal.server.storage.XMIServerURIConverter;
-import org.eclipse.emf.emfstore.server.ESCloseableIterable;
import org.eclipse.emf.emfstore.server.ESServerURIUtil;
/**
@@ -123,34 +116,6 @@
public void createResourceForChangePackage(AbstractChangePackage changePackage, PrimaryVersionSpec versionId,
ProjectId projectId) throws FatalESException {
final URI changePackageURI = ESServerURIUtil.createChangePackageURI(projectId, versionId);
- final List<Map.Entry<EObject, ModelElementId>> ignoredDatatypes = new ArrayList<Map.Entry<EObject, ModelElementId>>();
- final ESCloseableIterable<AbstractOperation> operations = changePackage.operations();
-
- try {
- for (final AbstractOperation operation : operations.iterable()) {
-
- if (operation instanceof CreateDeleteOperation) {
- final CreateDeleteOperation createDeleteOp = (CreateDeleteOperation) operation;
-
- for (final Map.Entry<EObject, ModelElementId> e : ((CreateDeleteOperationImpl) createDeleteOp)
- .getEObjectToIdMap().entrySet()) {
-
- final EObject modelElement = e.getKey();
-
- if (ModelUtil.isIgnoredDatatype(modelElement)) {
- ignoredDatatypes.add(e);
- continue;
- }
- }
-
- // remove types to be ignored from mapping
- createDeleteOp.getEObjectToIdMap().removeAll(ignoredDatatypes);
- }
- }
- } finally {
- operations.close();
- }
-
saveInResource(changePackage, changePackageURI);
}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/FileTransferSubInterfaceImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/FileTransferSubInterfaceImpl.java
index 9f607d5..da3040d 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/FileTransferSubInterfaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/FileTransferSubInterfaceImpl.java
@@ -22,7 +22,6 @@
import org.eclipse.emf.emfstore.internal.server.core.AbstractSubEmfstoreInterface;
import org.eclipse.emf.emfstore.internal.server.core.MonitorProvider;
import org.eclipse.emf.emfstore.internal.server.exceptions.FatalESException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.FileNotOnServerException;
import org.eclipse.emf.emfstore.internal.server.exceptions.FileTransferException;
import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidInputException;
import org.eclipse.emf.emfstore.internal.server.filetransfer.FileChunk;
@@ -86,7 +85,8 @@
try {
file = findFile(fileInformation, projectId);
} catch (final FileNotFoundException e) {
- throw new FileNotOnServerException(projectId, fileInformation.getFileIdentifier());
+ // throw new FileNotOnServerException(projectId, fileInformation.getFileIdentifier());
+ return null;
}
return FilePartitionerUtil.readChunk(file, fileInformation);
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/HistorySubInterfaceImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/HistorySubInterfaceImpl.java
index dbff961..5c610c3 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/HistorySubInterfaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/HistorySubInterfaceImpl.java
@@ -17,12 +17,15 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.emfstore.internal.common.model.ModelElementId;
import org.eclipse.emf.emfstore.internal.common.model.Project;
import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.internal.server.ServerConfiguration;
@@ -34,9 +37,12 @@
import org.eclipse.emf.emfstore.internal.server.exceptions.StorageException;
import org.eclipse.emf.emfstore.internal.server.model.ProjectHistory;
import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage;
import org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage;
import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo;
import org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryQuery;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.ModelElementQuery;
import org.eclipse.emf.emfstore.internal.server.model.versioning.PathQuery;
import org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec;
import org.eclipse.emf.emfstore.internal.server.model.versioning.RangeQuery;
@@ -45,6 +51,8 @@
import org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec;
import org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningFactory;
import org.eclipse.emf.emfstore.internal.server.model.versioning.Versions;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation;
+import org.eclipse.emf.emfstore.server.ESCloseableIterable;
import org.eclipse.emf.emfstore.server.ESServerURIUtil;
import org.eclipse.emf.emfstore.server.auth.ESMethod;
import org.eclipse.emf.emfstore.server.auth.ESMethod.MethodId;
@@ -182,12 +190,11 @@
synchronized (getMonitor()) {
// TODO LCP model element query disabled
- // if (historyQuery instanceof ModelElementQuery) {
- //
- // return handleMEQuery(projectId, (ModelElementQuery) historyQuery);
+ if (historyQuery instanceof ModelElementQuery) {
- // } else
- if (historyQuery instanceof RangeQuery) {
+ return handleMEQuery(projectId, (ModelElementQuery) historyQuery);
+
+ } else if (historyQuery instanceof RangeQuery) {
return versionToHistoryInfo(projectId, handleRangeQuery(projectId, (RangeQuery<?>) historyQuery),
historyQuery.isIncludeChangePackages());
@@ -239,52 +246,81 @@
return result;
}
- // TODO LCP
- // private List<HistoryInfo> handleMEQuery(ProjectId projectId, ModelElementQuery query) throws ESException {
- // final List<Version> inRange = handleRangeQuery(projectId, query);
- // // SortedSet<Version> relevantVersions = new TreeSet<Version>(new VersionComparator(false));
- // // for (ModelElementId id : query.getModelElements()) {
- // // relevantVersions.addAll(historyCache.getChangesForModelElement(projectId, id));
- // // }
- // // relevantVersions.retainAll(inRange);
- // final List<Version> relevantVersions = filterVersions(inRange, query.getModelElements());
- // final List<HistoryInfo> result = versionToHistoryInfo(projectId, relevantVersions,
- // query.isIncludeChangePackages());
- // // filter ops
- // for (final HistoryInfo historyInfo : result) {
- // filterOperationsForSelectedElements(query.getModelElements(), historyInfo);
- // }
- // return result;
- // }
+ private List<HistoryInfo> handleMEQuery(ProjectId projectId, ModelElementQuery query) throws ESException {
+ final List<Version> relevantVersions = filterVersions(
+ handleRangeQuery(projectId, query),
+ query.getModelElements());
+ final List<HistoryInfo> historyInfos = versionToHistoryInfo(
+ projectId,
+ relevantVersions,
+ query.isIncludeChangePackages());
+ final List<HistoryInfo> filteredHistoryInfos = new ArrayList<HistoryInfo>();
+
+ for (final HistoryInfo historyInfo : historyInfos) {
+ final HistoryInfo clonedHistoryInfo = ModelUtil.clone(historyInfo);
+ final List<AbstractOperation> ops = filterOperationsForSelectedElements(
+ query.getModelElements(),
+ clonedHistoryInfo);
+
+ if (historyInfo.getChangePackage() != null) {
+ final ChangePackage newChangePackage = VersioningFactory.eINSTANCE.createChangePackage();
+ newChangePackage.getOperations().addAll(ops);
+ newChangePackage.setLogMessage(historyInfo.getChangePackage().getLogMessage());
+ clonedHistoryInfo.setChangePackage(newChangePackage);
+ }
+ filteredHistoryInfos.add(clonedHistoryInfo);
+ }
+ return filteredHistoryInfos;
+ }
// TODO LCP combine with op filtering
- // private List<Version> filterVersions(List<Version> inRange, List<ModelElementId> modelElements) {
- // final ArrayList<Version> result = new ArrayList<Version>();
- // for (final Version version : inRange) {
- // // special case for initial version
- // if (version.getPrimarySpec() != null && version.getPrimarySpec().getIdentifier() == 0) {
- // if (version.getProjectState() != null) {
- // for (final ModelElementId id : modelElements) {
- // if (version.getProjectState().contains(id)) {
- // result.add(version);
- // break;
- // }
- // }
- // }
- // }
- // if (version.getChanges() == null) {
- // continue;
- // }
- // final Set<ModelElementId> involvedModelElements = version.getChanges().getAllInvolvedModelElements();
- // for (final ModelElementId id : modelElements) {
- // if (involvedModelElements.contains(id)) {
- // result.add(version);
- // break;
- // }
- // }
- // }
- // return result;
- // }
+ private List<Version> filterVersions(List<Version> inRange, List<ModelElementId> modelElements) {
+ final ArrayList<Version> result = new ArrayList<Version>();
+ for (final Version version : inRange) {
+ // special case for initial version
+ if (version.getPrimarySpec() != null && version.getPrimarySpec().getIdentifier() == 0) {
+ if (version.getProjectState() != null) {
+ for (final ModelElementId id : modelElements) {
+ if (version.getProjectState().contains(id)) {
+ result.add(version);
+ break;
+ }
+ }
+ }
+ }
+ if (version.getChanges() == null) {
+ continue;
+ }
+
+ final Set<ModelElementId> involvedModelElements = getAllInvolvedModelElements(version.getChanges());
+ for (final ModelElementId id : modelElements) {
+ if (involvedModelElements.contains(id)) {
+ result.add(version);
+ break;
+ }
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Returns all model elements associated with the given change package.
+ *
+ * @param changePackage the change package to analyze
+ * @return a set of {@link ModelElementId}s representing the involved model elements
+ */
+ public Set<ModelElementId> getAllInvolvedModelElements(AbstractChangePackage changePackage) {
+ final Set<ModelElementId> result = new LinkedHashSet<ModelElementId>();
+ final ESCloseableIterable<AbstractOperation> operations = changePackage.operations();
+ try {
+ for (final AbstractOperation op : operations.iterable()) {
+ result.addAll(op.getAllInvolvedModelElements());
+ }
+ } finally {
+ operations.close();
+ }
+ return result;
+ }
private int sourceNumber(HistoryQuery<?> query) throws ESException {
if (query.getSource() == null) {
@@ -402,29 +438,26 @@
}
// TODO LCP
- // private void filterOperationsForSelectedElements(List<ModelElementId> ids, HistoryInfo historyInfo) {
- // if (historyInfo.getChangePackage() == null) {
- // return;
- // }
- // final Set<AbstractOperation> operationsToRemove = new LinkedHashSet<AbstractOperation>();
- // final ESCloseableIterable<AbstractOperation> operations = historyInfo.getChangePackage().operations();
- //
- // try {
- // final Iterable<AbstractOperation> iterable = operations.iterable();
- //
- // } finally {
- //
- // }
- //
- // for (final AbstractOperation operation : operations) {
- // for (final ModelElementId id : ids) {
- // if (!operation.getAllInvolvedModelElements().contains(id)) {
- // operationsToRemove.add(operation);
- // }
- // }
- // }
- // operations.removeAll(operationsToRemove);
- // }
+ private List<AbstractOperation> filterOperationsForSelectedElements(List<ModelElementId> ids,
+ HistoryInfo historyInfo) {
+ final List<AbstractOperation> ops = new ArrayList<AbstractOperation>();
+ if (historyInfo.getChangePackage() == null) {
+ return ops;
+ }
+ final ESCloseableIterable<AbstractOperation> operations = historyInfo.getChangePackage().operations();
+ try {
+ for (final AbstractOperation operation : operations.iterable()) {
+ for (final ModelElementId id : ids) {
+ if (operation.getAllInvolvedModelElements().contains(id)) {
+ ops.add(operation);
+ }
+ }
+ }
+ } finally {
+ operations.close();
+ }
+ return ops;
+ }
private List<HistoryInfo> versionToHistoryInfo(ProjectId projectId, Collection<Version> versions, boolean includeCP)
throws ESException {
@@ -504,7 +537,7 @@
private final class VersionComparator implements Comparator<Version> {
private final boolean asc;
- public VersionComparator(boolean asc) {
+ VersionComparator(boolean asc) {
this.asc = asc;
}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/ProjectSubInterfaceImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/ProjectSubInterfaceImpl.java
index ca116f8..2f56d80 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/ProjectSubInterfaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/ProjectSubInterfaceImpl.java
@@ -151,7 +151,7 @@
/**
* Returns the project of a version.
- *
+ *
* @param version the version
* @return the project
* @throws InvalidVersionSpecException if the given version is invalid
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/VersionSubInterfaceImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/VersionSubInterfaceImpl.java
index a8956a8..02b6002 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/VersionSubInterfaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/subinterfaces/VersionSubInterfaceImpl.java
@@ -304,6 +304,7 @@
*
* @param sessionId
* the {@link SessionId} representing the requesting user
+ * @param projectId the {@link ProjectId} of the associated Project
* @param proxyId
* the ID that identifies the list of stored fragments
* @param fragmentIndex
@@ -312,7 +313,8 @@
* @throws ESException in case the mandatory session adapter is missing
*/
@ESMethod(MethodId.DOWNLOADCHANGEPACKAGEFRAGMENT)
- public ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, String proxyId, int fragmentIndex)
+ public ChangePackageEnvelope downloadChangePackageFragment(SessionId sessionId, ProjectId projectId, String proxyId,
+ int fragmentIndex)
throws ESException {
final ESSessionId resolvedSession = getAccessControl().getSessions().resolveSessionById(sessionId.getId());
@@ -377,6 +379,11 @@
final ACUser user = (ACUser) ESUserImpl.class.cast(copyAndResolveUser).toInternalAPI();
sanityCheckObjects(sessionId, projectId, baseVersionSpec, changePackage, logMessage);
+ final ProjectHistory projectHistory = getSubInterface(ProjectSubInterfaceImpl.class).getProject(projectId);
+ ModelUtil.logProjectDetails("Creating version on server...", user.getName(), projectHistory.getProjectName(), //$NON-NLS-1$
+ projectHistory.getProjectId().getId(), targetBranch != null ? targetBranch.getBranch() : null,
+ baseVersionSpec.getIdentifier());
+
if (FileBasedChangePackage.class.isInstance(changePackage)
&& !ServerConfiguration.useFileBasedChangePackageOnServer()) {
// File-based change package should never arrive here in production mode
@@ -387,8 +394,15 @@
throw new ESException(Messages.VersionSubInterfaceImpl_FileBasedChangePackageExpected);
}
- return internalCreateVersion(projectId, baseVersionSpec, changePackage, targetBranch, sourceVersion,
- logMessage, user);
+ final PrimaryVersionSpec result = internalCreateVersion(projectId, baseVersionSpec, changePackage, targetBranch,
+ sourceVersion, logMessage, user);
+
+ ModelUtil.logProjectDetails("Creating version on server... done", user.getName(), //$NON-NLS-1$
+ projectHistory.getProjectName(), projectHistory.getProjectId().getId(),
+ targetBranch != null ? targetBranch.getBranch() : null,
+ baseVersionSpec.getIdentifier());
+
+ return result;
}
private PrimaryVersionSpec internalCreateVersion(ProjectId projectId, PrimaryVersionSpec baseVersionSpec,
@@ -595,6 +609,9 @@
try {
if (ServerConfiguration.isComputeChecksumOnCommitActive()) {
computedChecksum = ModelUtil.computeChecksum(projectState);
+ ModelUtil.logProjectDetails(
+ MessageFormat.format("Checksum computation during version create: {0}", computedChecksum), //$NON-NLS-1$
+ user.getName(), projectHistory.getProjectName(), projectHistory.getProjectId().getId(), null, -1);
}
} catch (final SerializationException exception) {
// TODO: clarify what to do in case checksum computation fails + provide ext. point
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/impl/api/ESOrgUnitProviderImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/impl/api/ESOrgUnitProviderImpl.java
index a262ee8..64d5641 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/impl/api/ESOrgUnitProviderImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/impl/api/ESOrgUnitProviderImpl.java
@@ -70,7 +70,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.server.model.ESOrgUnitProvider#init(org.eclipse.emf.emfstore.server.model.ESOrgUnitRepository)
*/
public void init(ESOrgUnitRepository repository) {
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/messages.properties b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/messages.properties
index c8cb82e..a6cd530 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/messages.properties
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/messages.properties
@@ -11,11 +11,16 @@
EMFStoreController_Default_Properties_File_Copied=Default es.properties file was copied to config folder.
EMFStoreController_Dynamic_Model_Loaded=Dynamic Model "{0}" loaded.
EMFStoreController_EMFStore_Controller_Already_Running=Another EmfStore Controller seems to be running already\!
+EMFStoreController_EnterSuperUserPasswordAgain=Please enter the password again:
EMFStoreController_Error_During_Migration=Error during migration
EMFStoreController_Failed_To_Copy_Keystore=Failed to copy keystore.
EMFStoreController_Init_Complete=Initialitation COMPLETE.
EMFStoreController_JVM_Max_Memory=JVM Max Memory: {0} MByte
EMFStoreController_Keystore_Copied=Keystore was copied to server workspace.
+EMFStoreController_NoSuperUserPasswordPrompt=No super user password found. Please enter a password:
+EMFStoreController_PasswordDidNotMatch=Sorry, the passwords did not match. Please enter again.
+EMFStoreController_PasswordHashFailFileNotFound=Password hashing failed
+EMFStoreController_PasswordHashFailIOException=Password hashing failed
EMFStoreController_Property_Init_Failed=Property initialization failed, using default properties.
EMFStoreController_PropertyFile_Read=Property file read. ({0})
EMFStoreController_Serve_Forcefully_Stopped=Server was forcefully stopped.
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java
index 5f1ab6c..06bbb16 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java
@@ -175,7 +175,7 @@
for (final AbstractOperation abstractOperation : operations.iterable()) {
if (!(abstractOperation instanceof CompositeOperation)
&& (abstractOperation.getModelElementId() == null
- || abstractOperation.getModelElementId().getId() == null)) {
+ || abstractOperation.getModelElementId().getId() == null)) {
errors.add(
MessageFormat.format(
Messages.EmfStoreValidator_ChangeOperation_Has_No_ModelElementId,
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java
index 986064c..1c651fb 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java
@@ -198,7 +198,7 @@
}
private String getProjectAttribute(String pathToFile) throws ParserConfigurationException, SAXException,
- IOException {
+ IOException {
final DocumentBuilderFactory docFactory = DocumentBuilderFactory
.newInstance();
final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
@@ -269,7 +269,8 @@
}
}
- private void removeReferencesToCorruptProject(String serverHome, String projectId) throws InvocationTargetException {
+ private void removeReferencesToCorruptProject(String serverHome, String projectId)
+ throws InvocationTargetException {
try {
final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
final DocumentBuilder builder = factory.newDocumentBuilder();
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java
index 6c4bd12..0c45811 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java
@@ -56,7 +56,7 @@
for (final File file : files) {
final ResourceSet resourceSet = new ResourceSetImpl();
resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
- .put("ecore", new EcoreResourceFactoryImpl());
+ .put("ecore", new EcoreResourceFactoryImpl());
final Resource resource = resourceSet.getResource(URI.createFileURI(file.getAbsolutePath()), true);
final EPackage model = (EPackage) resource.getContents().get(0);
result.add(model);
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java
index 607777c..0d82f1f 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java
@@ -46,8 +46,7 @@
}
@Override
- public void delete(URI uri, Map<?, ?> options) throws IOException
- {
+ public void delete(URI uri, Map<?, ?> options) throws IOException {
// TODO options?
final File file = new File(uri.toFileString());
final File parent = file.getParentFile();
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java
index 11528c8..73a61a5 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java
@@ -43,7 +43,7 @@
*/
boolean checkProjectAdminAccess(ESSessionId sessionId, ESGlobalProjectId projectId,
ESProjectAdminPrivileges privileg)
- throws AccessControlException;
+ throws AccessControlException;
/**
* Check if the session is valid for admin access to the given organizational unit.
@@ -76,7 +76,7 @@
*/
boolean checkProjectAdminAccessForOrgUnit(ESSessionId sessionId, ESOrgUnitId orgUnitId,
Set<ESGlobalProjectId> projectIds)
- throws AccessControlException;
+ throws AccessControlException;
/**
* Check if the session is valid for admin access to the given project.
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESHashAndSalt.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESHashAndSalt.java
new file mode 100644
index 0000000..3f6ac52
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESHashAndSalt.java
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.server.auth;
+
+/**
+ * Default implementation of a {@link ESPasswordHashGenerator.ESHashAndSalt ESHashAndSalt}.
+ *
+ * @author Johannes Faltermeier
+ * @since 1.9
+ *
+ */
+public final class ESHashAndSalt implements ESPasswordHashGenerator.ESHashAndSalt {
+
+ private final String hash;
+ private final String salt;
+
+ private ESHashAndSalt(String hash, String salt) {
+ this.hash = hash;
+ this.salt = salt;
+ }
+
+ /**
+ * Factory method for creating {@link ESHashAndSalt}s.
+ *
+ * @param hash the hash
+ * @param salt the salt
+ * @return the instance
+ */
+ public static ESHashAndSalt create(String hash, String salt) {
+ return new ESHashAndSalt(hash, salt);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt#getHash()
+ */
+ public String getHash() {
+ return hash;
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt#getSalt()
+ */
+ public String getSalt() {
+ return salt;
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESPasswordHashGenerator.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESPasswordHashGenerator.java
new file mode 100644
index 0000000..63613f0
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESPasswordHashGenerator.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.server.auth;
+
+/**
+ * A PasswordHash Generator is able to generate a hash using a newly created salt for a given password. Moreover it is
+ * able to verify if a password matches a stored hash/salt.
+ *
+ * @author Johannes Faltermeier
+ * @since 1.9
+ *
+ */
+public interface ESPasswordHashGenerator {
+
+ /**
+ * This method will hash the password using a newly generated salt. Hash and salt will be returned.
+ *
+ * @param password the password to hash
+ * @return a {@link ESHashAndSalt}
+ */
+ ESHashAndSalt hashPassword(String password);
+
+ /**
+ * Verifies if the given password matches the hash/salt.
+ *
+ * @param password the password to verify
+ * @param hash the saved hash
+ * @param salt the saved salt
+ * @return <code>true</code> if password matches, <code>false</code> otherwise
+ */
+ boolean verifyPassword(String password, String hash, String salt);
+
+ /**
+ * Wrapper interface for a hash/salt pair.
+ *
+ * @author Johannes Faltermeier
+ *
+ */
+ interface ESHashAndSalt {
+ /**
+ * A separator char helping to separate hashes and salts.
+ */
+ String SEPARATOR = " "; //$NON-NLS-1$
+
+ /**
+ * @return the hash
+ */
+ String getHash();
+
+ /**
+ *
+ * @return the salt
+ */
+ String getSalt();
+ }
+
+}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
index 539611c..84c178e 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
@@ -41,7 +41,7 @@
*/
ESAuthenticationInformation verifyUser(String username, String password,
ESClientVersionInfo clientVersionInfo)
- throws AccessControlException;
+ throws AccessControlException;
/**
* Initializes this verifier.
diff --git a/features/org.eclipse.emf.emfstore.client.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.feature/feature.xml
index 57eb585..d318d3b 100644
--- a/features/org.eclipse.emf.emfstore.client.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.client.feature"
label="EMFStore Client"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.client"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to contact the EMFStore server from a client application.
diff --git a/features/org.eclipse.emf.emfstore.client.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.feature/pom.xml
index 37c488f..c97c120 100644
--- a/features/org.eclipse.emf.emfstore.client.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
index 27e1a83..0a8b3f9 100644
--- a/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.transaction.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.client.transaction.feature"
label="EMFStore Transaction Support"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.client.transaction"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature adds transaction support to EMFStore based on EMF Transaction. It automatically registers an TransactionalEditingDomain with the EMFStore.
diff --git a/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
index e3e7cd6..d84252a 100644
--- a/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.transaction.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.transaction.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
index a88a81e..c6d5cea 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.client.ui.feature"
label="EMFStore Client UI"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.client.ui"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to provide user interfaces
diff --git a/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
index 2357cdf..9e47762 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
index 0a1be03..b188d13 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature"
label="HistoryBrowserComparator"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.client.ui.historybrowsercomparator"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature adds a comparator to EMFStore's history browser.
@@ -23,8 +23,8 @@
<requires>
<import plugin="org.eclipse.emf.compare" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.compare" version="3.5.300" match="compatible"/>
- <import plugin="org.eclipse.emf.emfstore.client" version="1.8.1" match="compatible"/>
- <import plugin="org.eclipse.emf.emfstore.client.ui" version="1.8.1" match="compatible"/>
+ <import plugin="org.eclipse.emf.emfstore.client" version="1.9.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.emfstore.client.ui" version="1.9.0" match="compatible"/>
<import plugin="org.eclipse.emf.compare.ide.ui" version="4.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.compare.ide" version="3.1.0" match="compatible"/>
<import plugin="org.eclipse.emf.compare.edit" version="4.0.0" match="compatible"/>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
index a1b38de..da082ad 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
index d3eb1bd..d4f795b 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.client.ui.rap.feature"
label="EMFStore Client UI RAP"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.client.ui"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to provide user interfaces
diff --git a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
index fda0241..2e851a1 100644
--- a/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.client.ui.rap.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.rap.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.common.feature/feature.xml b/features/org.eclipse.emf.emfstore.common.feature/feature.xml
index 39475b3..d97189e 100644
--- a/features/org.eclipse.emf.emfstore.common.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.common.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.common.feature"
label="EMFStore Common"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.common"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
Contains common plugins of EMFStore that are used by other EMFStore features.
diff --git a/features/org.eclipse.emf.emfstore.common.feature/pom.xml b/features/org.eclipse.emf.emfstore.common.feature/pom.xml
index 2388cbf..f862b1e 100644
--- a/features/org.eclipse.emf.emfstore.common.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.common.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.common.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/.checkstyle b/features/org.eclipse.emf.emfstore.ecore.feature/.checkstyle
deleted file mode 100644
index 75246d3..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/.checkstyle
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
- <fileset name="all" enabled="true" check-config-name="Sun Checks" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
-</fileset-config>
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/.project b/features/org.eclipse.emf.emfstore.ecore.feature/.project
deleted file mode 100644
index 58f5207..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.emf.emfstore.ecore.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.emfstore.ecore.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.emf.emfstore.ecore.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4824b80..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.emf.emfstore.ecore.feature/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index c522e1f..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/build.properties b/features/org.eclipse.emf.emfstore.ecore.feature/build.properties
deleted file mode 100644
index b3a611b..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/feature.properties b/features/org.eclipse.emf.emfstore.ecore.feature/feature.properties
deleted file mode 100644
index e69de29..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/feature.properties
+++ /dev/null
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml b/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
deleted file mode 100644
index 8ab7678..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/feature.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.emfstore.ecore.feature"
- label="EMFStore Ecore"
- version="1.8.1.qualifier"
- provider-name="Eclipse Modeling Project"
- plugin="org.eclipse.emf.emfstore.ecore"
- license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
-
- <description url="http://emfstore.org">
- Contains ecore plugin of EMFStore that is used by other EMFStore features.
- </description>
-
- <copyright url="%copyrightURL">
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.eclipse.emf.emfstore.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml b/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
deleted file mode 100644
index 45f1bec..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.eclipse.emf.emfstore</groupId>
- <artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
- <relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
- </parent>
- <groupId>org.eclipse.emf.emfstore</groupId>
- <artifactId>org.eclipse.emf.emfstore.ecore.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
- <packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho.extras</groupId>
- <artifactId>tycho-source-feature-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>source-feature</id>
- <phase>package</phase>
- <goals>
- <goal>source-feature</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho-version}</version>
- <executions>
- <execution>
- <id>attached-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/sourceTemplateFeature/.gitignore b/features/org.eclipse.emf.emfstore.ecore.feature/sourceTemplateFeature/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/sourceTemplateFeature/.gitignore
+++ /dev/null
diff --git a/features/org.eclipse.emf.emfstore.ecore.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.emf.emfstore.ecore.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 8204251..0000000
--- a/features/org.eclipse.emf.emfstore.ecore.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,137 +0,0 @@
-
-providerName = Eclipse Modeling Project
-updateSiteName = Eclipse Modeling Project Updates
-
-copyrightURL = copyright.txt
-copyright = Copyright (c) 2011-2013 EclipseSource Munich GmbH\n\
-and\n\
-Copyright (c) 2008-2011 Chair for Applied Software Engineering,\n\
-Technische Universitaet Muenchen.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-
-licenseURL=license.html
-license=Eclipse Foundation Software User Agreement\n\
-April 9, 2014\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-\t- Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
diff --git a/features/org.eclipse.emf.emfstore.example.feature/feature.xml b/features/org.eclipse.emf.emfstore.example.feature/feature.xml
index 0845928..3dcb2d2 100644
--- a/features/org.eclipse.emf.emfstore.example.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.example.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.example.feature"
label="EMFStore Code Examples"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.example.installer"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org ">
EMFStore Code Examples
diff --git a/features/org.eclipse.emf.emfstore.example.feature/pom.xml b/features/org.eclipse.emf.emfstore.example.feature/pom.xml
index 5d933a2..4335a18 100644
--- a/features/org.eclipse.emf.emfstore.example.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.example.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.example.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml b/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
index 4f279cc..5e62807 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.fuzzy.feature"
label="Fuzzy Testing Feature"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.branding"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains the fuzzy testing framework and the EMFDataProvider
@@ -22,16 +22,17 @@
</license>
<requires>
- <import plugin="org.eclipse.emf.emfstore.modelmutator"/>
- <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.core.runtime" version="3.7.0" match="compatible"/>
- <import plugin="org.junit" version="4.11.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.5.0" match="compatible"/>
- <import plugin="org.eclipse.emf.emfstore.client.test"/>
<import plugin="org.eclipse.core.resources" version="3.7.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore.xmi" version="2.5.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit.ui" version="2.5.0" match="compatible"/>
<import plugin="org.eclipse.ui.ide" version="3.7.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.ecore" version="2.5.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.emfstore.modelmutator" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.emfstore.fuzzy.emf" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.emf.emfstore.fuzzy.emf.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.junit" version="4.10.0" match="compatible"/>
</requires>
<plugin
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml b/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
index 9205935..7b9dd88 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.fuzzy.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
index 17110a7..0fe6510 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.emfstore.fuzzy.test.feature"
label="EMFStore Fuzzy Tests"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://www.example.com/description">
This feature contains the integration plugins for EMFStore with fuzzy testing.
diff --git a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
index aa73c7f..a5392f8 100644
--- a/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.fuzzy.test.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.fuzzy.test.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.emfstore.license.feature/feature.xml b/features/org.eclipse.emf.emfstore.license.feature/feature.xml
index 157c69d..c466958 100644
--- a/features/org.eclipse.emf.emfstore.license.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.license.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.emfstore.license.feature"
label="EMFStore License"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description>
diff --git a/features/org.eclipse.emf.emfstore.license.feature/pom.xml b/features/org.eclipse.emf.emfstore.license.feature/pom.xml
index 0f41ffb..49f4d90 100644
--- a/features/org.eclipse.emf.emfstore.license.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.license.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.license.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml b/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
index 59f857a..d58efb2 100644
--- a/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.migration.edapt.feature/feature.xml
@@ -2,10 +2,10 @@
<feature
id="org.eclipse.emf.emfstore.migration.edapt.feature"
label="EMFStore Edapt Migration"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to migrate EMFStore-hosted
@@ -222,12 +222,12 @@
</license>
<requires>
- <import plugin="org.eclipse.emf.emfstore.migration" version="1.8.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.emf.emfstore.migration" version="1.9.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.runtime" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.common" version="2.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.edapt.migration" version="1.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.edapt.history" version="1.2.0" match="greaterOrEqual"/>
- <import plugin="org.eclipse.emf.emfstore.common.model" version="1.8.1" match="greaterOrEqual"/>
+ <import plugin="org.eclipse.emf.emfstore.common.model" version="1.9.0" match="greaterOrEqual"/>
</requires>
<plugin
diff --git a/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml b/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
index 6f56728..42753af 100644
--- a/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.migration.edapt.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.migration.edapt.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs b/features/org.eclipse.emf.emfstore.modelmutator.feature/.settings/org.eclipse.jdt.ui.prefs
similarity index 94%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs
rename to features/org.eclipse.emf.emfstore.modelmutator.feature/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/features/org.eclipse.emf.emfstore.modelmutator.feature/.settings/org.eclipse.pde.ds.annotations.prefs b/features/org.eclipse.emf.emfstore.modelmutator.feature/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml b/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
index 3a8a953..cfee70c 100644
--- a/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/feature.xml
@@ -6,7 +6,7 @@
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.modelmutator"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
Contains a set of plugins that may be used to alter existing
diff --git a/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml b/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
index 4dfe8d5..c0b4ff1 100644
--- a/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.modelmutator.feature/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml b/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
index 2e9826e..7360d2f 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.client.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.mongodb.client.feature"
label="EMFStore mongoDB Client Feature"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.mongodb.client"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to run the EMFStore client
diff --git a/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml b/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
index c7227b5..61ab864 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.client.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.mongodb.client.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml b/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
index eee6666..c6ccfb2 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.server.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.mongodb.server.feature"
label="EMFStore mongoDB Server Feature"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.mongodb.server"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to run the EMFStore server
diff --git a/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml b/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
index 52f79cf..a8842a6 100644
--- a/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.mongodb.server.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.mongodb.server.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml b/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
index e1f686d..3de08e3 100644
--- a/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.sdk.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.sdk.feature"
label="EMFStore SDK"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.branding"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all core plugins including sources to use the EMFStore.
@@ -44,10 +44,6 @@
id="org.eclipse.emf.emfstore.license.feature"
version="0.0.0"/>
- <includes
- id="org.eclipse.emf.emfstore.ecore.feature"
- version="0.0.0"/>
-
<plugin
id="org.eclipse.emf.emfstore.client.source"
download-size="0"
@@ -133,13 +129,6 @@
unpack="false"/>
<plugin
- id="org.eclipse.emf.emfstore.ecore.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.emf.emfstore.client.ui.rcp.source"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml b/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
index b1eb7e3..f1cf8f7 100644
--- a/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.sdk.feature/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.sdk.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/features/org.eclipse.emf.emfstore.server.feature/feature.xml b/features/org.eclipse.emf.emfstore.server.feature/feature.xml
index a8939bc..a94218c 100644
--- a/features/org.eclipse.emf.emfstore.server.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.server.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.server.feature"
label="EMFStore Server"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.server"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all plugins to run the EMFStore server.
diff --git a/features/org.eclipse.emf.emfstore.server.feature/pom.xml b/features/org.eclipse.emf.emfstore.server.feature/pom.xml
index e4b5b70..5e740f6 100644
--- a/features/org.eclipse.emf.emfstore.server.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.server.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.server.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/features/org.eclipse.emf.emfstore.test.feature/feature.xml b/features/org.eclipse.emf.emfstore.test.feature/feature.xml
index 2f6cd70..1bd3505 100644
--- a/features/org.eclipse.emf.emfstore.test.feature/feature.xml
+++ b/features/org.eclipse.emf.emfstore.test.feature/feature.xml
@@ -2,11 +2,11 @@
<feature
id="org.eclipse.emf.emfstore.test.feature"
label="EMFStore Tests"
- version="1.8.1.qualifier"
+ version="1.9.0.qualifier"
provider-name="Eclipse Modeling Project"
plugin="org.eclipse.emf.emfstore.branding"
license-feature="org.eclipse.emf.emfstore.license.feature"
- license-feature-version="1.8.1.qualifier">
+ license-feature-version="1.9.0.qualifier">
<description url="http://emfstore.org">
This feature contains all test plugins as well as helper and utility classes to write custom EMFStore tests.
diff --git a/features/org.eclipse.emf.emfstore.test.feature/pom.xml b/features/org.eclipse.emf.emfstore.test.feature/pom.xml
index 12bd055..da315fc 100644
--- a/features/org.eclipse.emf.emfstore.test.feature/pom.xml
+++ b/features/org.eclipse.emf.emfstore.test.feature/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.features</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.test.feature</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/releng/EMFStoreTargetPlatform/feature.xml b/releng/EMFStoreTargetPlatform/feature.xml
index c5bcaaa..32a9580 100644
--- a/releng/EMFStoreTargetPlatform/feature.xml
+++ b/releng/EMFStoreTargetPlatform/feature.xml
@@ -293,12 +293,6 @@
version="0.0.0"/>
<plugin
- id="org.eclipse.emf.emfstore.ecore"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
id="org.eclipse.emf.emfstore.migration"
download-size="0"
install-size="0"
diff --git a/releng/_marketplace/_mpparent/pom.xml b/releng/_marketplace/_mpparent/pom.xml
index 407e0ca..2a9dbd1 100644
--- a/releng/_marketplace/_mpparent/pom.xml
+++ b/releng/_marketplace/_mpparent/pom.xml
@@ -30,11 +30,11 @@
<configuration>
<source>
<repository>
- <url>http://download.eclipse.org/ecp/releases/releases_18/180_RC4</url>
+ <url>http://download.eclipse.org/ecp/releases/releases_111/1110</url>
<layout>p2</layout>
</repository>
<repository>
- <url>http://download.eclipse.org/emfstore/releases_17/170</url>
+ <url>http://download.eclipse.org/emfstore/releases_18/181</url>
<layout>p2</layout>
</repository>
</source>
@@ -61,4 +61,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/releng/_target/emfstore-neon.target b/releng/_target/emfstore-neon.target
new file mode 100644
index 0000000..d9d8e46
--- /dev/null
+++ b/releng/_target/emfstore-neon.target
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?><target name="EMFStore" sequenceNumber="245">
+<locations>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.compare.rcp.ui.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/modeling/emf/compare/updates/releases/3.0/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.edapt.runtime.feature.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/edapt/releases/12x/120"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="com.google.guava" version="0.0.0"/>
+<unit id="javax.annotation" version="0.0.0"/>
+<unit id="javax.annotation.source" version="0.0.0"/>
+<unit id="com.google.guava.source" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.apache.log4j.source" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
+<unit id="org.hamcrest.core" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.forms.feature.group" version="0.0.0"/>
+<unit id="org.apache.log4j" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="0.0.0"/>
+<unit id="org.hamcrest.library.source" version="0.0.0"/>
+<unit id="org.hamcrest.library" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.hamcrest.core.source" version="0.0.0"/>
+<repository location="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
+<unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
+<unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.graphiti.export.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.graphiti.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.validation.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.gef.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.net4j.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.compare.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.emf.compare.ide.ui.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ocl.all.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/neon/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jetty.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/juno/"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipselabs.mongo.emf.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipselabs.mongo.emf.feature.source.feature.group" version="0.0.0"/>
+<repository location="http://bryanhunt.github.com/mongo-emf/releases/0.7.1"/>
+</location>
+<location includeAllPlatforms="true" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.emf.ecp.sdk.feature.feature.group" version="1.10.0.20160912-1709"/>
+<repository location="http://download.eclipse.org/ecp/releases/releases_110/"/>
+</location>
+</locations>
+</target>
diff --git a/releng/_target/pom.xml b/releng/_target/pom.xml
index 3f64ebf..139c3ea 100644
--- a/releng/_target/pom.xml
+++ b/releng/_target/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/emfstore-parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-target-definition</packaging>
</project>
\ No newline at end of file
diff --git a/releng/emfstore-parent/pom.xml b/releng/emfstore-parent/pom.xml
index 80a7733..85026c9 100644
--- a/releng/emfstore-parent/pom.xml
+++ b/releng/emfstore-parent/pom.xml
@@ -5,7 +5,7 @@
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -16,8 +16,8 @@
<maven-checkstyle-version>2.10</maven-checkstyle-version>
<jacoco-version>0.7.4.201502262128</jacoco-version>
<javadoc-version>2.9</javadoc-version>
- <javadoc-title>EMFStore 1.8.1 API</javadoc-title>
- <emfstore-version>1.8.1-SNAPSHOT</emfstore-version>
+ <javadoc-title>EMFStore 1.9.0 API</javadoc-title>
+ <emfstore-version>1.9.0-SNAPSHOT</emfstore-version>
<jarsigner-version>1.0.5</jarsigner-version>
<maven.antrun.plugin.version>1.7</maven.antrun.plugin.version>
<!-- Properties to enable jacoco code coverage analysis with sonar -->
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/category.xml b/releng/org.eclipse.emf.emfstore.p2repository/category.xml
index dc976c2..cfc95bf 100644
--- a/releng/org.eclipse.emf.emfstore.p2repository/category.xml
+++ b/releng/org.eclipse.emf.emfstore.p2repository/category.xml
@@ -23,10 +23,7 @@
</feature>
<feature id="org.eclipse.emf.emfstore.mongodb.server.feature" version="0.0.0">
<category name="org.eclipse.emf.emfstore.other"/>
- </feature>
- <feature id="org.eclipse.emf.emfstore.ecore.feature" version="0.0.0">
- <category name="org.eclipse.emf.emfstore.other"/>
- </feature>
+ </feature>
<feature id="org.eclipse.emf.emfstore.client.transaction.feature" version="0.0.0">
<category name="org.eclipse.emf.emfstore.other"/>
</feature>
diff --git a/releng/org.eclipse.emf.emfstore.p2repository/pom.xml b/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
index 4b8a333..43dbfb0 100644
--- a/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.p2repository/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../emfstore-parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.p2repository</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<!-- see http://www.codetrails.com/blog/maven-tycho-how-to-configure-your-repos-mirror-and-statistics-uris -->
diff --git a/releng/org.eclipse.emf.emfstore.products/pom.xml b/releng/org.eclipse.emf.emfstore.products/pom.xml
index 0b9ac1e..09d0947 100644
--- a/releng/org.eclipse.emf.emfstore.products/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.products/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../emfstore-parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.products</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-repository</packaging>
<build>
diff --git a/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml b/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
index 26a5390..823446c 100644
--- a/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.releng.bundles/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../emfstore-parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-bundles-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -27,7 +27,6 @@
<module>../../bundles/org.eclipse.emf.emfstore.client.ui.rap</module>
<module>../../bundles/org.eclipse.emf.emfstore.common.model.edit</module>
<module>../../bundles/org.eclipse.emf.emfstore.server.model.edit</module>
- <module>../../bundles/org.eclipse.emf.emfstore.ecore</module>
<module>../../bundles/org.eclipse.emf.emfstore.client</module>
<module>../../bundles/org.eclipse.emf.emfstore.client.transaction</module>
<module>../../bundles/org.eclipse.emf.emfstore.client.ui.transaction</module>
diff --git a/releng/org.eclipse.emf.emfstore.releng.features/pom.xml b/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
index 5f35c75..083ba86 100644
--- a/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.releng.features/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../emfstore-parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-features-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
@@ -19,7 +19,6 @@
<module>../../features/org.eclipse.emf.emfstore.server.feature</module>
<module>../../features/org.eclipse.emf.emfstore.client.ui.feature</module>
<module>../../features/org.eclipse.emf.emfstore.client.ui.rap.feature</module>
- <module>../../features/org.eclipse.emf.emfstore.ecore.feature</module>
<module>../../features/org.eclipse.emf.emfstore.client.feature</module>
<module>../../features/org.eclipse.emf.emfstore.client.transaction.feature</module>
<module>../../features/org.eclipse.emf.emfstore.client.ui.historybrowsercomparator.feature</module>
diff --git a/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml b/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
index 4f4bc5d..a8caf16 100644
--- a/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
+++ b/releng/org.eclipse.emf.emfstore.releng.tests/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../emfstore-parent/</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/AllAPITests.launch b/tests/org.eclipse.emf.emfstore.client.api.test/AllAPITests.launch
index 615de5b..cb91b42 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/AllAPITests.launch
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/AllAPITests.launch
@@ -3,7 +3,7 @@
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
@@ -12,8 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.emf.emfstore.branding,org.eclipse.emf.emfstore.client.example.test,org.eclipse.emf.emfstore.client.test.alltests,org.eclipse.emf.emfstore.client.test.ui,org.eclipse.emf.emfstore.client.transaction,org.eclipse.emf.emfstore.client.ui,org.eclipse.emf.emfstore.client.ui.historybrowsercomparator,org.eclipse.emf.emfstore.client.ui.rap,org.eclipse.emf.emfstore.client.ui.rcp,org.eclipse.emf.emfstore.ecore,org.eclipse.emf.emfstore.example.helloworld,org.eclipse.emf.emfstore.example.installer,org.eclipse.emf.emfstore.example.merging,org.eclipse.emf.emfstore.example.sessionprovider,org.eclipse.emf.emfstore.examplemodel.edit,org.eclipse.emf.emfstore.fuzzy.emf.edit,org.eclipse.emf.emfstore.fuzzy.emf.editor,org.eclipse.emf.emfstore.fuzzy.emf.example,org.eclipse.emf.emfstore.mongodb,org.eclipse.emf.emfstore.mongodb.client,org.eclipse.emf.emfstore.mongodb.server"/>
-<booleanAttribute key="includeOptional" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/AllAPITests.java"/>
@@ -33,8 +32,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product.tcp_h2"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation*1.0.0.v20101115-0725@default:default,javax.annotation*1.2.0.v201401042248@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.text@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.eclipsesource.makeithappen.model.edit@default:default,com.eclipsesource.makeithappen.model@default:default,org.eclipse.b3.aggregator.edit@default:default,org.eclipse.b3.aggregator.editor@default:default,org.eclipse.b3.aggregator.engine.maven@default:default,org.eclipse.b3.aggregator.engine@default:default,org.eclipse.b3.aggregator.legacy.ui@default:default,org.eclipse.b3.aggregator.legacy@default:default,org.eclipse.b3.aggregator@default:default,org.eclipse.b3.backend@default:default,org.eclipse.b3.beelang.generator@default:default,org.eclipse.b3.beelang.junit@default:default,org.eclipse.b3.beelang.tests@default:default,org.eclipse.b3.beelang.ui.experiments@default:default,org.eclipse.b3.beelang.ui@default:default,org.eclipse.b3.beelang@default:default,org.eclipse.b3.build.ui.idefragment@default:false,org.eclipse.b3.build.ui@default:default,org.eclipse.b3.build@default:default,org.eclipse.b3.cli@default:default,org.eclipse.b3.core@default:default,org.eclipse.b3.p2.edit@default:default,org.eclipse.b3.p2.maven.indexer@default:default,org.eclipse.b3.p2.maven@default:default,org.eclipse.b3.p2.tests@default:default,org.eclipse.b3.p2@default:default,org.eclipse.b3.util@default:default,org.eclipse.emf.ecp.makeithappen.model.edit@default:default,org.eclipse.emf.ecp.makeithappen.model.viewmodel@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client.test@default:default,org.eclipse.emf.emfstore.client.ui.test@default:false,org.eclipse.emf.emfstore.client.ui.transaction@default:default,org.eclipse.emf.emfstore.client.ws.test@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.fuzzy.emf.diff.test@default:default,org.eclipse.emf.emfstore.fuzzy.emf.test@default:default,org.eclipse.emf.emfstore.fuzzy.emf@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator.test@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.performance.test@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi*3.11.0.v20160603-1336@-1:true,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services*3.5.100.v20160504-1419@default:default,org.eclipse.swt.gtk.linux.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
index 6a5b799..5462194 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: Client API Tests
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.api.test
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.client.api.test;version="1.8.
- 1";x-internal:=true
+Export-Package: org.eclipse.emf.emfstore.client.api.test;version="1.9.
+ 0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
org.hamcrest.library;bundle-version="[1.3.0,2.0.0)"
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
index b45b134..75eba0e 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.api.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/AllAPITests.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/AllAPITests.java
index 83cdbe8..3f9e2af 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/AllAPITests.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/AllAPITests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -16,7 +16,7 @@
/**
* Test Suite for running all tests of canonization.
- *
+ *
* @author koegel
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/BranchTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/BranchTest.java
index 8bd110b..256e5b0 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/BranchTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/BranchTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -41,9 +41,9 @@
/**
* Testing of branch related API.
- *
+ *
* @author emueller
- *
+ *
*/
public class BranchTest extends ESTestWithSharedProject {
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ClientTestUtil.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ClientTestUtil.java
index bf445a1..7a69282 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ClientTestUtil.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ClientTestUtil.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -19,7 +19,7 @@
/**
* @author emueller
- *
+ *
*/
public final class ClientTestUtil {
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ProjectChangeUtil.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ProjectChangeUtil.java
index cd23412..0079ae0 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ProjectChangeUtil.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ProjectChangeUtil.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Tobias Verhoeven - initial API and implementation
******************************************************************************/
@@ -25,7 +25,7 @@
/**
* Utility class to easily create bowling model instances.
- *
+ *
* @author Tobias Verhoeven
*/
public final class ProjectChangeUtil {
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java
index 84345c7..97db60d 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.api.test;
@@ -169,7 +169,8 @@
getUsersession(),
ESHistoryQuery.FACTORY
.pathQuery(getRemoteProject().getHeadVersion(monitor),
- getRemoteProject().getHeadVersion(monitor), true, true), monitor);
+ getRemoteProject().getHeadVersion(monitor), true, true),
+ monitor);
assertEquals(1, historyInfos.size());
}
@@ -179,7 +180,8 @@
final List<? extends ESHistoryInfo> historyInfos = getRemoteProject().getHistoryInfos(
ESHistoryQuery.FACTORY.pathQuery(
getRemoteProject().getHeadVersion(monitor),
- getRemoteProject().getHeadVersion(monitor), true, true), monitor);
+ getRemoteProject().getHeadVersion(monitor), true, true),
+ monitor);
assertEquals(1, historyInfos.size());
}
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RunESCommandTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RunESCommandTest.java
index b283297..aebec85 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RunESCommandTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RunESCommandTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial APi and implementation
******************************************************************************/
@@ -28,7 +28,7 @@
/**
* Test if {@code RunESCommand} exception handling.
- *
+ *
* @author emueller
*/
public class RunESCommandTest extends ESTestWithSharedProject {
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCommunicationTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCommunicationTest.java
index bc97d97..ee3f2b5 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCommunicationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCommunicationTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.api.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCreationTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCreationTest.java
index a042ed8..8eac4ae 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCreationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/ServerCreationTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.api.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/SharedProjectTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/SharedProjectTest.java
index 207ee7a..e206721 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/SharedProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/SharedProjectTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.api.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UnsharedLocalProjectTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UnsharedLocalProjectTest.java
index 8632a2d..8a81b68 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UnsharedLocalProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UnsharedLocalProjectTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.api.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UsersessionTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UsersessionTest.java
index 66ac35c..30ce977 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UsersessionTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/UsersessionTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.api.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
index 5c985b2..dfdd1bf 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Changetracking Tests
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.changetracking.test
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
org.eclipse.emf.emfstore.modelmutator;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.emfstore.client.changetracking.test;ve
- rsion="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.client.change
- tracking.test.canonization;version="1.8.1";x-internal:=true,org.eclip
- se.emf.emfstore.client.changetracking.test.command;version="1.8.1";x-
+ rsion="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.client.change
+ tracking.test.canonization;version="1.9.0";x-internal:=true,org.eclip
+ se.emf.emfstore.client.changetracking.test.command;version="1.9.0";x-
internal:=true,org.eclipse.emf.emfstore.client.changetracking.test.no
- tification;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.
- client.changetracking.test.toplogy;version="1.8.1";x-internal:=true
+ tification;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.
+ client.changetracking.test.toplogy;version="1.9.0";x-internal:=true
Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
index 0278c29..6863fea 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.changetracking.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/AllChangeTrackingTests.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/AllChangeTrackingTests.java
index 46ee5a4..0b481d6 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/AllChangeTrackingTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/AllChangeTrackingTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick
******************************************************************************/
@@ -20,7 +20,7 @@
/**
* Test Suite for running all tests of workspace.
- *
+ *
* @author chodnick
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/canonization/AllCanonizationTests.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/canonization/AllCanonizationTests.java
index fd67ed0..d594f58 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/canonization/AllCanonizationTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/canonization/AllCanonizationTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -16,7 +16,7 @@
/**
* Test Suite for running all tests of canonization.
- *
+ *
* @author koegel
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java
index 8a93fe3..c62279a 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java
@@ -632,8 +632,7 @@
// cut to clipboard
final Command cutCommand = CutToClipboardCommand.create(editingDomain, leafSection,
- TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS
- , actor);
+ TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS, actor);
if (cutCommand.canExecute()) {
editingDomain.getCommandStack().execute(cutCommand);
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AllNotificationTests.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AllNotificationTests.java
index ceb5c70..f9d84e0 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AllNotificationTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AllNotificationTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick - initial API and implementation
* Edgar Mueller - added ProjectTest
@@ -17,7 +17,7 @@
/**
* Test Suite for running all tests of workspace.
- *
+ *
* @author chodnick
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AttributeNotificationTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AttributeNotificationTest.java
index b714721..5dcc616 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AttributeNotificationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/AttributeNotificationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick
******************************************************************************/
@@ -29,7 +29,7 @@
/**
* Tests the notification recording for attribute features.
- *
+ *
* @author chodnick
*/
public class AttributeNotificationTest extends ESTest {
@@ -39,7 +39,7 @@
/**
* Change an attribute and check the generated notification.
- *
+ *
* @throws UnsupportedOperationException on test fail
* @throws UnsupportedNotificationException on test fail
*/
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ContainmentNotificationTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ContainmentNotificationTest.java
index 78c29e8..4bae9cd 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ContainmentNotificationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ContainmentNotificationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick
******************************************************************************/
@@ -29,7 +29,7 @@
/**
* Tests the notification recording for attribute features.
- *
+ *
* @author chodnick
*/
public class ContainmentNotificationTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MoveNotificationTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MoveNotificationTest.java
index c2093fd..3e3af99 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MoveNotificationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MoveNotificationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick - initial API and implementation
******************************************************************************/
@@ -36,7 +36,7 @@
/**
* Tests the notification recording for attribute features.
- *
+ *
* @author chodnick
*/
public class MoveNotificationTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MultiReferenceNotificationTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MultiReferenceNotificationTest.java
index b0e121b..82ae123 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MultiReferenceNotificationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/MultiReferenceNotificationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick
******************************************************************************/
@@ -27,7 +27,7 @@
/**
* Tests the notification recording for attribute features.
- *
+ *
* @author chodnick
*/
public class MultiReferenceNotificationTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/NotificationToOperationConverterTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/NotificationToOperationConverterTest.java
index e5734d1..7cc98a7 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/NotificationToOperationConverterTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/NotificationToOperationConverterTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* jsommerfeldt
******************************************************************************/
@@ -32,9 +32,9 @@
/**
* Test the {@link NotificationToOperationConverter}.
- *
+ *
* @author jsommerfeldt
- *
+ *
*/
public class NotificationToOperationConverterTest extends ESTest {
@@ -54,7 +54,7 @@
/**
* Remove all attributes in a many attribute.
- *
+ *
*/
@Test
public void removeAllAttributes() {
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ReferenceNotificationTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ReferenceNotificationTest.java
index c5b5b08..af239b8 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ReferenceNotificationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/notification/ReferenceNotificationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* chodnick
******************************************************************************/
@@ -30,7 +30,7 @@
/**
* Tests the notification recording for attribute features.
- *
+ *
* @author chodnick
*/
public class ReferenceNotificationTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/AllTopologyTests.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/AllTopologyTests.java
index 5d9357d..a3db0d4 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/AllTopologyTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/AllTopologyTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -16,7 +16,7 @@
/**
* Test Suite for running all tests of topology.
- *
+ *
* @author koegel
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java
index 837b975..63c019f 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java
@@ -56,7 +56,7 @@
*/
@Test
public void containmentNullToValueNotContainedAlreadyOperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement solution = Create.testElement();
@@ -109,7 +109,7 @@
*/
@Test
public void containmentNullToValueNotContainedAlreadyOperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement solution = Create.testElement();
@@ -163,7 +163,7 @@
*/
@Test
public void containmentValueToOtherValueNotContainedAlreadyOperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement solutionOld = Create.testElement();
@@ -232,7 +232,7 @@
*/
@Test
public void containmentValueToOtherValueNotContainedAlreadyOperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement solutionOld = Create.testElement();
@@ -308,7 +308,7 @@
*/
@Test
public void containmentValueToOtherValueContainedAlready1OperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue1 = Create.testElement();
final TestElement issue2 = Create.testElement();
@@ -384,7 +384,7 @@
*/
@Test
public void containmentValueToOtherValueContainedAlready1OperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue1 = Create.testElement();
final TestElement issue2 = Create.testElement();
@@ -460,7 +460,7 @@
*/
@Test
public void containmentNullToOtherValueContainedAlready1OperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue1 = Create.testElement();
final TestElement issue2 = Create.testElement();
@@ -525,7 +525,7 @@
*/
@Test
public void containmentNullToOtherValueContainedAlready1OperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue1 = Create.testElement();
final TestElement issue2 = Create.testElement();
@@ -596,7 +596,7 @@
// BEGIN COMPLEX CODE
@Test
public void containmentValueToOtherValueContainedAlreadyNOperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement leafSection = Create.testElement();
@@ -692,7 +692,7 @@
// BEGIN COMPLEX CODE
@Test
public void containmentValueToOtherValueContainedAlreadyNOperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement leafSection = Create.testElement();
@@ -784,7 +784,7 @@
*/
@Test
public void containmentNullToValueContainedAlreadyNOperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement leafSection = Create.testElement();
@@ -863,7 +863,7 @@
*/
@Test
public void containmentNullToValueContainedAlreadyNOperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement leafSection = Create.testElement();
@@ -946,7 +946,7 @@
*/
@Test
public void containmentValueToNullOperateOnParent() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement solution = Create.testElement();
@@ -994,7 +994,7 @@
*/
@Test
public void containmentValueToNullOperateOnChild() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement solution = Create.testElement();
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java
index ea8f272..6d77767 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java
@@ -413,7 +413,7 @@
*/
@Test
public void containmentAddUncontainedChildrenFakeManyToNonEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement section = Create.testElement();
final TestElement actor1 = Create.testElement();
@@ -1251,7 +1251,7 @@
// BEGIN COMPLEX CODE
@Test
public void containmentAddDifferentFeatureContained1ChildrenToNonEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement section = Create.testElement();
final TestElement issue1 = Create.testElement();
@@ -1728,7 +1728,8 @@
* @throws UnsupportedNotificationException on test fail
*/
@Test
- public void containmentRemoveChildAndEmpty() throws UnsupportedOperationException, UnsupportedNotificationException {
+ public void containmentRemoveChildAndEmpty()
+ throws UnsupportedOperationException, UnsupportedNotificationException {
final TestElement section = Create.testElement();
final TestElement actor = Create.testElement();
@@ -1776,7 +1777,7 @@
*/
@Test
public void containmentRemoveChildrenAndEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement section = Create.testElement();
final TestElement actor1 = Create.testElement();
@@ -1939,7 +1940,7 @@
*/
@Test
public void nonContainmentAddChildrenToEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement useCase = Create.testElement();
final TestElement actor1 = Create.testElement();
@@ -2004,7 +2005,7 @@
*/
@Test
public void nonContainmentAddChildToNonEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement useCase = Create.testElement();
final TestElement oldTestElement = Create.testElement();
@@ -2060,7 +2061,7 @@
*/
@Test
public void nonContainmentAddChildrenToNonEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement useCase = Create.testElement();
final TestElement oldTestElement = Create.testElement();
@@ -2127,7 +2128,7 @@
*/
@Test
public void nonContainmentRemoveChildAndEmpty() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement useCase = Create.testElement();
final TestElement actor = Create.testElement();
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java
index 74dd4cb..a8df1ff 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java
@@ -151,7 +151,7 @@
*/
@Test
public void setNoncontainingParentFromNullToValue() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement actor = Create.testElement();
final TestElement useCase = Create.testElement();
@@ -206,7 +206,7 @@
*/
@Test
public void setNoncontainingParentFromValueToNull() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement actor = Create.testElement();
final TestElement useCase = Create.testElement();
@@ -262,7 +262,7 @@
*/
@Test
public void setNoncontainingParentFromValueToOtherValue() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement actor = Create.testElement();
final TestElement otherTestElement = Create.testElement();
@@ -331,7 +331,7 @@
@Test
public void setContainerFromValueToOtherValueSameFeature() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement section1 = Create.testElement();
final TestElement section2 = Create.testElement();
@@ -398,7 +398,7 @@
@Test
public void setContainerFromValueToOtherValueDifferentFeatureN() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement section = Create.testElement();
final TestElement pack = Create.testElement();
@@ -471,7 +471,7 @@
@Test
public void setContainerFromValueToOtherValueDifferentFeature1() throws UnsupportedOperationException,
- UnsupportedNotificationException {
+ UnsupportedNotificationException {
final TestElement issue = Create.testElement();
final TestElement section = Create.testElement();
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
index d99e3a6..f08c37f 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.conflictdetection.test
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.emfstore.client.conflictdetection.test
- ;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.client.con
- flictdetection.test.merging;version="1.8.1";x-internal:=true; uses:="
+ ;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.client.con
+ flictdetection.test.merging;version="1.9.0";x-internal:=true; uses:="
org.eclipse.emf.emfstore.internal.common.model, org.eclipse.emf.ecor
e, org.eclipse.emf.emfstore.internal.client.model.changeTracking.mer
ging, org.eclipse.emf.emfstore.internal.client.model, org.eclipse.e
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
index 3e8354b..4597601 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.conflictdetection.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java
index 5673bcd..c1d531d 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java
@@ -525,7 +525,8 @@
final List<AbstractOperation> operations = forceGetOperations();
assertEquals(2, operations.size());
- final CreateDeleteOperation createDeleteOperation = checkAndCast(operations.get(0), CreateDeleteOperation.class);
+ final CreateDeleteOperation createDeleteOperation = checkAndCast(operations.get(0),
+ CreateDeleteOperation.class);
final MultiReferenceOperation multiRefOp = checkAndCast(
createDeleteOperation.getSubOperations().get(0),
@@ -565,10 +566,8 @@
private void addObserverTo(ESLocalProject localProject,
IdEObjectCollectionChangeObserver idEObjectCollectionChangeObserver) {
ESLocalProjectImpl.class.cast(
- localProject
- ).toInternalAPI().getProject().addIdEObjectCollectionChangeObserver(
- idEObjectCollectionChangeObserver
- );
+ localProject).toInternalAPI().getProject().addIdEObjectCollectionChangeObserver(
+ idEObjectCollectionChangeObserver);
}
@Test
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMultiAttributeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMultiAttributeTest.java
index 7cd25b0..93fa983 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMultiAttributeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMultiAttributeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* wesendon
******************************************************************************/
@@ -28,7 +28,7 @@
/**
* Conflicttests for MultiAttribute, -Set and -Move operations.
- *
+ *
* @author wesendon
*/
public class ConflictDetectionMultiAttributeTest extends ConflictDetectionTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AllMergeTests.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AllMergeTests.java
index e272e92..766b69e 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AllMergeTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AllMergeTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.conflictdetection.test.merging;
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AttributeMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AttributeMergeTest.java
index 3f701c8..13b4c23 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AttributeMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/AttributeMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* wesendon
******************************************************************************/
@@ -20,7 +20,7 @@
/**
* AttributeOperation merge tests.
- *
+ *
* @author wesendon
*/
public class AttributeMergeTest extends MergeTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/CompositeMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/CompositeMergeTest.java
index 0c29ba0..89a2ca8 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/CompositeMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/CompositeMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.conflictdetection.test.merging;
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/DeleteMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/DeleteMergeTest.java
index 5d64837..4546713 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/DeleteMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/DeleteMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.conflictdetection.test.merging;
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiAttributeMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiAttributeMergeTest.java
index c27e0dc..0108698 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiAttributeMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiAttributeMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* wesendon
******************************************************************************/
@@ -27,7 +27,7 @@
/**
* Merge testcases for {@link MultiAttributeOperation} and {@link MultiAttributeSetOperation}.
- *
+ *
* @author wesendon
*/
public class MultiAttributeMergeTest extends MergeTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceContainmentMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceContainmentMergeTest.java
index bac2552..82c9dbb 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceContainmentMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceContainmentMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.conflictdetection.test.merging;
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceMergeTest.java
index 6eaa30a..f20caf7 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/MultiReferenceMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.conflictdetection.test.merging;
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceMergeTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceMergeTest.java
index a02ae5e..d68fe2a 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceMergeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceMergeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.conflictdetection.test.merging;
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceVsMultiMergeTets.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceVsMultiMergeTets.java
index d341024..8638c73 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceVsMultiMergeTets.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/merging/SingleReferenceVsMultiMergeTets.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* wesendon
******************************************************************************/
@@ -25,7 +25,7 @@
/**
* These only conflict through <b>containment</b> side effects.
- *
+ *
* @author wesendon
*/
public class SingleReferenceVsMultiMergeTets extends MergeTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
index ce31d9b..da9fb2a 100644
--- a/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore API Test
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.example.test
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.example.merging;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.example.merging;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.example.helloworld;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)",
org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.emfstore.client.example.test;version="
- 1.8.1";x-internal:=true
+ 1.9.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
index 3a7ce9b..c46342d 100644
--- a/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.example.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.example.test/src/org/eclipse/emf/emfstore/client/example/test/APIUsedInExampleTest.java b/tests/org.eclipse.emf.emfstore.client.example.test/src/org/eclipse/emf/emfstore/client/example/test/APIUsedInExampleTest.java
index 84adddf..46062e7 100644
--- a/tests/org.eclipse.emf.emfstore.client.example.test/src/org/eclipse/emf/emfstore/client/example/test/APIUsedInExampleTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.example.test/src/org/eclipse/emf/emfstore/client/example/test/APIUsedInExampleTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Maximilian Koegel
******************************************************************************/
@@ -22,9 +22,9 @@
/**
* Tests the API used in the example plugins.
- *
+ *
* @author mkoegel
- *
+ *
*/
public class APIUsedInExampleTest extends ESTestWithLoggedInUserMock {
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/AllRecordingTests.launch b/tests/org.eclipse.emf.emfstore.client.recording.test/AllRecordingTests.launch
index bb9e687..3a0a7e2 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/AllRecordingTests.launch
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/AllRecordingTests.launch
@@ -3,7 +3,7 @@
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
@@ -12,8 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="com.eclipsesource.makeithappen.model,com.eclipsesource.makeithappen.model.edit,org.eclipse.b3.aggregator,org.eclipse.b3.aggregator.edit,org.eclipse.b3.aggregator.editor,org.eclipse.b3.aggregator.engine,org.eclipse.b3.aggregator.engine.maven,org.eclipse.b3.aggregator.legacy,org.eclipse.b3.aggregator.legacy.ui,org.eclipse.b3.backend,org.eclipse.b3.beelang,org.eclipse.b3.beelang.generator,org.eclipse.b3.beelang.junit,org.eclipse.b3.beelang.tests,org.eclipse.b3.beelang.ui,org.eclipse.b3.beelang.ui.experiments,org.eclipse.b3.build,org.eclipse.b3.build.ui,org.eclipse.b3.build.ui.idefragment,org.eclipse.b3.cli,org.eclipse.b3.core,org.eclipse.b3.p2,org.eclipse.b3.p2.edit,org.eclipse.b3.p2.maven,org.eclipse.b3.p2.maven.indexer,org.eclipse.b3.p2.tests,org.eclipse.b3.util,org.eclipse.emf.ecp.makeithappen.model,org.eclipse.emf.ecp.makeithappen.model.edit,org.eclipse.emf.ecp.makeithappen.model.viewmodel,org.eclipse.emf.emfstore.branding,org.eclipse.emf.emfstore.client.example.test,org.eclipse.emf.emfstore.client.model.edit,org.eclipse.emf.emfstore.client.test,org.eclipse.emf.emfstore.client.test.alltests,org.eclipse.emf.emfstore.client.test.ui,org.eclipse.emf.emfstore.client.transaction,org.eclipse.emf.emfstore.client.ui,org.eclipse.emf.emfstore.client.ui.historybrowsercomparator,org.eclipse.emf.emfstore.client.ui.rap,org.eclipse.emf.emfstore.client.ui.rcp,org.eclipse.emf.emfstore.client.ws.test,org.eclipse.emf.emfstore.common.model.edit,org.eclipse.emf.emfstore.ecore,org.eclipse.emf.emfstore.example.helloworld,org.eclipse.emf.emfstore.example.installer,org.eclipse.emf.emfstore.example.merging,org.eclipse.emf.emfstore.example.sessionprovider,org.eclipse.emf.emfstore.examplemodel.edit,org.eclipse.emf.emfstore.fuzzy.emf,org.eclipse.emf.emfstore.fuzzy.emf.diff.test,org.eclipse.emf.emfstore.fuzzy.emf.edit,org.eclipse.emf.emfstore.fuzzy.emf.editor,org.eclipse.emf.emfstore.fuzzy.emf.example,org.eclipse.emf.emfstore.fuzzy.emf.test,org.eclipse.emf.emfstore.modelmutator.test,org.eclipse.emf.emfstore.mongodb,org.eclipse.emf.emfstore.mongodb.client,org.eclipse.emf.emfstore.mongodb.server,org.eclipse.emf.emfstore.performance.test,org.eclipse.emf.emfstore.server.model.edit"/>
-<booleanAttribute key="includeOptional" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllRecordingTests.java"/>
@@ -33,7 +32,7 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.emf.cdo.server.product.tcp_h2"/>
<booleanAttribute key="run_in_ui_thread" value="true"/>
-<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,javax.inject@default:default,javax.servlet@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi*3.11.0.v20160603-1336@-1:true,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services*3.5.100.v20160504-1419@default:default,org.eclipse.swt.gtk.linux.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
index 0b6bd13..d9475b0 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
Bundle-ManifestVersion: 2
Bundle-Name: Test
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.recording.test
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
Export-Package: org.eclipse.emf.emfstore.client.recording.test;version
- ="1.8.1";x-internal:=true
+ ="1.9.0";x-internal:=true
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
index 0ff5b50..7525740 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.recording.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllRecordingTests.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllRecordingTests.java
index 964d960..859ce60 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllRecordingTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllRecordingTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -16,7 +16,7 @@
/**
* Test Suite for running all tests of workspace.
- *
+ *
* @author koegel
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java
index e693a8f..ca868e8 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java
@@ -105,7 +105,8 @@
public void commandIdAllocation() {
removeAddWithCommand(new EqualComparator());
removeAddWithCommands(new NotEqualComparator());
- if (ESWorkspaceProviderImpl.getInstance().getEditingDomain().getCommandStack() instanceof EMFStoreBasicCommandStack) {
+ if (ESWorkspaceProviderImpl.getInstance().getEditingDomain()
+ .getCommandStack() instanceof EMFStoreBasicCommandStack) {
removeAddWithoutCommand(new NotEqualComparator());
removeAddWithoutCommand2(new NotEqualComparator());
}
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AttributeOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AttributeOperationTest.java
index ece3872..01fccae 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AttributeOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AttributeOperationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -43,7 +43,7 @@
/**
* Tests the Attribute Operation.
- *
+ *
* @author koegel
*/
public class AttributeOperationTest extends ESTest {
@@ -85,7 +85,7 @@
/**
* Change an attribute twice and check the generated operations after cannonization.
- *
+ *
* @throws UnsupportedOperationException on test fail
* @throws UnsupportedNotificationException on test fail
* @throws ESException
@@ -136,7 +136,7 @@
/**
* Change an attribute and reverse the operation and check the result.
- *
+ *
* @throws UnsupportedOperationException on test fail
* @throws UnsupportedNotificationException on test fail
* @throws ESException
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/CreateDeleteOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/CreateDeleteOperationTest.java
index 0a55c9d..efc34ed 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/CreateDeleteOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/CreateDeleteOperationTest.java
@@ -15,6 +15,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
@@ -50,6 +51,7 @@
import org.eclipse.emf.emfstore.internal.common.model.impl.ProjectImpl;
import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AbstractOperation;
+import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation;
import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation;
import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation;
import org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation;
@@ -947,14 +949,15 @@
assertEquals(getProject(), ModelUtil.getProject(parentTestElement));
assertTrue(getProject().contains(testElement));
assertEquals(getProject(), ModelUtil.getProject(testElement));
- assertFalse(getProject().contains(newTestElement));
- assertFalse(getProject().contains(newChildElement1));
- assertFalse(getProject().contains(newChildElement2));
+ assertTrue(getProject().contains(newTestElement));
+ assertTrue(getProject().contains(newChildElement1));
+ assertTrue(getProject().contains(newChildElement2));
assertTrue(getProject().contains(newChildElement3));
- assertEquals(2, newTestElement.getContainedElements().size());
+ assertEquals(3, newTestElement.getContainedElements().size());
assertEquals(newChildElement1, newTestElement.getContainedElements().get(0));
assertEquals(newChildElement2, newTestElement.getContainedElements().get(1));
+ assertEquals(newChildElement3, newTestElement.getContainedElements().get(2));
assertEquals(newTestElement, newChildElement1.getReferences().get(0));
assertEquals(newChildElement1, newChildElement2.getReferences().get(0));
@@ -984,9 +987,10 @@
assertTrue(getProject().contains(newChildElement2));
assertTrue(getProject().contains(newChildElement3));
- assertEquals(2, newTestElement.getContainedElements().size());
+ assertEquals(3, newTestElement.getContainedElements().size());
assertEquals(newChildElement1, newTestElement.getContainedElements().get(0));
assertEquals(newChildElement2, newTestElement.getContainedElements().get(1));
+ assertEquals(newChildElement3, newTestElement.getContainedElements().get(2));
assertEquals(newTestElement, newChildElement1.getReferences().get(0));
assertEquals(newChildElement1, newChildElement2.getReferences().get(0));
@@ -994,49 +998,20 @@
assertEquals(newChildElement3, testElement.getReferences().get(0));
final List<AbstractOperation> operations = forceGetOperations();
- assertEquals(2, operations.size());
- final AbstractOperation operation = operations.get(0);
- assertTrue(operation instanceof CreateDeleteOperation);
- final CreateDeleteOperation createDeleteOperation = (CreateDeleteOperation) operation;
-
- final ModelElementId newTestElementId = ModelUtil.getProject(newTestElement).getModelElementId(newTestElement);
- final TestElement copiedNewTestElement = (TestElement) createDeleteOperation.getModelElement();
- final TestElement copiedNewChildElement1 = copiedNewTestElement.getContainedElements().get(0);
- final TestElement copiedNewChildElement2 = copiedNewTestElement.getContainedElements().get(1);
-
- assertEquals(2, copiedNewTestElement.getContainedElements().size());
- assertEquals(copiedNewTestElement, copiedNewChildElement1.getReferences().get(0));
- assertEquals(copiedNewChildElement1, copiedNewChildElement2.getReferences().get(0));
- assertEquals(1, copiedNewChildElement2.getReferences().size());
-
- assertEquals(newTestElementId, createDeleteOperation.getModelElementId());
- assertEquals(1, createDeleteOperation.getSubOperations().size());
- assertFalse(createDeleteOperation.isDelete());
- assertTrue(CommonUtil.isSelfContained(createDeleteOperation, true));
-
- // check sub-operations of 1st operation
- final MultiReferenceOperation subOperation1 = (MultiReferenceOperation) createDeleteOperation
- .getSubOperations().get(
- 0);
-
- // sub-operation 1
- assertEquals(newChildElement2, getProject().getModelElement(subOperation1.getModelElementId()));
- assertEquals(REFERENCES, subOperation1.getFeatureName());
- assertEquals(testElement, getProject().getModelElement(subOperation1.getReferencedModelElements().get(0)));
+ assertEquals(1, operations.size());
// check 2nd operation
- final MultiReferenceOperation operation2 = (MultiReferenceOperation) operations.get(1);
+ final CompositeOperation operation1 = (CompositeOperation) operations.get(0);
+
+ final MultiReferenceOperation operation2 = (MultiReferenceOperation) operation1.getMainOperation();// operations.get(0);
assertEquals(parentTestElement, getProject().getModelElement(operation2.getModelElementId()));
assertEquals(newTestElement, getProject().getModelElement(operation2.getReferencedModelElements().get(0)));
- assertTrue(operations.get(1) instanceof MultiReferenceOperation);
- final MultiReferenceOperation multiRefOp = (MultiReferenceOperation) operations.get(1);
-
- assertEquals(parentTestElement, getProject().getModelElement(multiRefOp.getModelElementId()));
- assertEquals(TestElementFeatures.containedElements().getName(), multiRefOp.getFeatureName());
- assertEquals(newTestElement, getProject().getModelElement(multiRefOp.getReferencedModelElements().get(0)));
- assertTrue(multiRefOp.isAdd());
+ assertEquals(parentTestElement, getProject().getModelElement(operation2.getModelElementId()));
+ assertEquals(TestElementFeatures.containedElements().getName(), operation2.getFeatureName());
+ assertEquals(newTestElement, getProject().getModelElement(operation2.getReferencedModelElements().get(0)));
+ assertTrue(operation2.isAdd());
}
// END COMPLEX CODE
@@ -1663,4 +1638,70 @@
* child.getContainingWorkpackage()); assertSame(child, existing.getContainingWorkpackage());
* assertEquals(getProject().getAllModelElements().size(), 3); }
*/
+
+ @Test
+ public void testCreateCutElementsFromOtherProject() {
+ /* Setup */
+ final ProjectSpace projectSpaceOriginal = getProjectSpace();
+ final ProjectSpace projectSpaceCopy = cloneProjectSpace(projectSpaceOriginal);
+
+ final TestElement testElementA = Create.testElement();
+ final TestElement testElementB = Create.testElement();
+ final TestElement testElementC = Create.testElement();
+ testElementB.setContainedElement(testElementC);
+
+ RunESCommand.run(new Callable<Void>() {
+ public Void call() throws Exception {
+ projectSpaceOriginal.getProject().getModelElements().add(testElementA);
+ projectSpaceCopy.getProject().getModelElements().add(testElementB);
+ return null;
+ }
+ });
+
+ /* Act */
+ RunESCommand.run(new Callable<Void>() {
+ public Void call() throws Exception {
+ testElementA.setReference(testElementC);
+ return null;
+ }
+ });
+
+ /* Assert */
+ // A+C
+ assertSame(testElementA, projectSpaceOriginal.getProject().getModelElements().get(0));
+ assertSame(testElementC, projectSpaceOriginal.getProject().getModelElements().get(1));
+ // B
+ assertSame(testElementB, projectSpaceCopy.getProject().getModelElements().get(0));
+ }
+
+ @Test
+ public void testCreateCutElementsFromNonProject() {
+ /* Setup */
+ final ProjectSpace projectSpaceOriginal = getProjectSpace();
+
+ final TestElement testElementA = Create.testElement();
+ final TestElement testElementB = Create.testElement();
+ final TestElement testElementC = Create.testElement();
+ testElementB.setContainedElement(testElementC);
+
+ RunESCommand.run(new Callable<Void>() {
+ public Void call() throws Exception {
+ projectSpaceOriginal.getProject().getModelElements().add(testElementA);
+ return null;
+ }
+ });
+
+ /* Act */
+ RunESCommand.run(new Callable<Void>() {
+ public Void call() throws Exception {
+ testElementA.setReference(testElementC);
+ return null;
+ }
+ });
+
+ /* Assert */
+ // A+B(C)
+ assertSame(testElementA, projectSpaceOriginal.getProject().getModelElements().get(0));
+ assertSame(testElementB, projectSpaceOriginal.getProject().getModelElements().get(1));
+ }
}
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeMoveOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeMoveOperationTest.java
index 4976698..3198b06 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeMoveOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeMoveOperationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Otto von Wesendonk - initial API and implementation
******************************************************************************/
@@ -33,7 +33,7 @@
/**
* Tests for the {@link MultiAttributeMoveOperation}.
- *
+ *
* @author wesendon
*/
public class MultiAttributeMoveOperationTest extends ESTest {
@@ -70,7 +70,7 @@
/**
* Test creation of element with cross references.
- *
+ *
*/
@Test
public void createMultipleChildrenTestAtOnce() throws UnsupportedOperationException,
@@ -126,7 +126,7 @@
/**
* Test creation of element with cross references.
- *
+ *
*/
// BEGIN COMPLEX CODE
@Test
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeSetTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeSetTest.java
index 047f4f2..c6a0462 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeSetTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeSetTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Otto von Wesendonk - initial API and implementation
******************************************************************************/
@@ -36,7 +36,7 @@
/**
* Tests for multiattributeset operations.
- *
+ *
* @author wesendon
*/
public class MultiAttributeSetTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeTest.java
index 447e5aa..b50b932 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiAttributeTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* wesendon
******************************************************************************/
@@ -30,7 +30,7 @@
/**
* Tests for MultiAttributes.
- *
+ *
* @author wesendon
*/
public class MultiAttributeTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferceOperationReverseApplyTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferceOperationReverseApplyTest.java
index 55ee480..9bd9b1e 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferceOperationReverseApplyTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferceOperationReverseApplyTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceMoveOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceMoveOperationTest.java
index 4ca8224..ce6f6e1 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceMoveOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceMoveOperationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Maximilian Koegel - initial API and implementation
******************************************************************************/
@@ -36,14 +36,14 @@
/**
* Tests the MultiReferenceMoveOperation.
- *
+ *
* @author koegel
*/
public class MultiReferenceMoveOperationTest extends ESTest {
/**
* Change a multi reference and check the generated operation.
- *
+ *
*/
@Test
public void makeMultiReferenceMove() throws UnsupportedOperationException, UnsupportedNotificationException {
@@ -117,7 +117,7 @@
/**
* Change a multi reference and check the generated operation.
- *
+ *
*/
@Test
public void reverseMultiReferenceMove() throws UnsupportedOperationException, UnsupportedNotificationException {
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java
index 2b651ec..9fd904d 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Maximilian Koegel - initial API and implementation
******************************************************************************/
@@ -45,7 +45,7 @@
/**
* Tests the MultiReferenceOperation.
- *
+ *
* @author koegel
*/
public class MultiReferenceOperationTest extends ESTest {
@@ -110,7 +110,8 @@
assertEquals(TestElementFeatures.nonContained1ToN().getName(), multiReferenceOperation.getFeatureName());
assertEquals(0, multiReferenceOperation.getIndex());
assertEquals(actorId, multiReferenceOperation.getModelElementId());
- assertEquals(TestElementFeatures.nonContainedNTo1().getName(), multiReferenceOperation.getOppositeFeatureName());
+ assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
+ multiReferenceOperation.getOppositeFeatureName());
assertTrue(multiReferenceOperation.isAdd());
assertTrue(multiReferenceOperation.isBidirectional());
@@ -173,7 +174,8 @@
final ModelElementId useCaseId = ModelUtil.getProject(useCase).getModelElementId(useCase);
final MultiReferenceOperation reversedMultiReferenceOperation = (MultiReferenceOperation) reverse;
- assertEquals(TestElementFeatures.nonContained1ToN().getName(), reversedMultiReferenceOperation.getFeatureName());
+ assertEquals(TestElementFeatures.nonContained1ToN().getName(),
+ reversedMultiReferenceOperation.getFeatureName());
assertEquals(0, reversedMultiReferenceOperation.getIndex());
assertEquals(actorId, reversedMultiReferenceOperation.getModelElementId());
assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
@@ -282,7 +284,8 @@
assertEquals(TestElementFeatures.nonContained1ToN().getName(), multiReferenceOperation.getFeatureName());
assertEquals(0, multiReferenceOperation.getIndex());
assertEquals(actorId, multiReferenceOperation.getModelElementId());
- assertEquals(TestElementFeatures.nonContainedNTo1().getName(), multiReferenceOperation.getOppositeFeatureName());
+ assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
+ multiReferenceOperation.getOppositeFeatureName());
assertTrue(multiReferenceOperation.isAdd());
assertTrue(multiReferenceOperation.isBidirectional());
@@ -380,7 +383,8 @@
assertEquals(TestElementFeatures.nonContained1ToN().getName(), multiReferenceOperation.getFeatureName());
assertEquals(0, multiReferenceOperation.getIndex());
assertEquals(actorId, multiReferenceOperation.getModelElementId());
- assertEquals(TestElementFeatures.nonContainedNTo1().getName(), multiReferenceOperation.getOppositeFeatureName());
+ assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
+ multiReferenceOperation.getOppositeFeatureName());
assertFalse(multiReferenceOperation.isAdd());
assertTrue(multiReferenceOperation.isBidirectional());
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceSetOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceSetOperationTest.java
index a3eb3a7..0cd2d92 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceSetOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceSetOperationTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* wesendon
******************************************************************************/
@@ -30,7 +30,7 @@
/**
* Tests for multireferenceset operations.
- *
+ *
* @author wesendon
*/
public class MultiReferenceSetOperationTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
index 4888da7..631acbc 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Julian Sommerfeldt - initial API and implementation
******************************************************************************/
@@ -45,9 +45,9 @@
/**
* Test some OperationRecorder functionalities.
- *
+ *
* @author jsommerfeldt
- *
+ *
*/
public class OperationRecorderTest extends ComparingESTest {
@@ -134,7 +134,8 @@
@Test
public void rescueElementAndDeleteIt() {
- if (ESWorkspaceProviderImpl.getInstance().getEditingDomain().getCommandStack() instanceof EMFStoreBasicCommandStack) {
+ if (ESWorkspaceProviderImpl.getInstance().getEditingDomain()
+ .getCommandStack() instanceof EMFStoreBasicCommandStack) {
// ExtensionRegistry.INSTANCE.set(ESOperationModifier.ID, new AutoOperationWrapper());
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/StopWatch.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/StopWatch.java
index b0f56b0..142d736 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/StopWatch.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/StopWatch.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.recording.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
index 5d25317..e4d4df0 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/META-INF/MANIFEST.MF
@@ -6,8 +6,8 @@
Bundle-Activator: org.eclipse.emf.emfstore.client.test.alltests.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.7.0,4.0.0)",
org.eclipse.emf.emfstore.client.test;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.client.test.ui;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="1.8.1",
+ org.eclipse.emf.emfstore.client.test.ui;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="1.9.0",
org.junit;bundle-version="4.0.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/Activator.java b/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/Activator.java
index 2945946..404557f 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/Activator.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/Activator.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.alltests;
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/DynamicSuite.java b/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/DynamicSuite.java
index dafe097..6c5bb62 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/DynamicSuite.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/DynamicSuite.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Johannes Faltermeier - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/TransactionalEditingDomainTests.java b/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/TransactionalEditingDomainTests.java
index c86803e..78ea32a 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/TransactionalEditingDomainTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.alltests/src/org/eclipse/emf/emfstore/client/test/alltests/TransactionalEditingDomainTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Johannes Faltermeier
******************************************************************************/
@@ -16,9 +16,9 @@
/**
* Test suite for all SWT, API and ChangeTracking Tests. Used for testing with
* transactional editing domain on build server.
- *
+ *
* @author jfaltermeier
- *
+ *
*/
@RunWith(DynamicSuite.class)
public class TransactionalEditingDomainTests {
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
index 038bbc1..7303310 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/META-INF/MANIFEST.MF
@@ -2,25 +2,25 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client UI Tests
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.test.ui;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.emfstore.client.test;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.client.ui;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.client.ui;bundle-version="[1.9.0,2.0.0)",
org.eclipse.ui;bundle-version="[3.0.0,4.0.0)",
org.eclipse.swtbot.eclipse.core;bundle-version="[2.1.0,3.0.0)",
org.eclipse.swtbot.eclipse.finder;bundle-version="[2.1.0,3.0.0)",
org.eclipse.swtbot.forms.finder;bundle-version="[2.1.0,3.0.0)",
org.eclipse.swtbot.junit4_x;bundle-version="[2.1.0,3.0.0)",
org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.expressions;bundle-version="3.4.401"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.emf.emfstore.client.test.ui.Activator
Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.emfstore.client.test.ui;version="1.8.1
+Export-Package: org.eclipse.emf.emfstore.client.test.ui;version="1.9.0
";x-internal:=true,org.eclipse.emf.emfstore.client.test.ui.conflictde
- tection;version="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.cli
- ent.test.ui.controllers;version="1.8.1";x-internal:=true,org.eclipse.
- emf.emfstore.client.test.ui.testers;version="1.8.1"
+ tection;version="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.cli
+ ent.test.ui.controllers;version="1.9.0";x-internal:=true,org.eclipse.
+ emf.emfstore.client.test.ui.testers;version="1.9.0"
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
index 0f73650..aa16c00 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.test.ui</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/Activator.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/Activator.java
index 8c6eb46..f18b551 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/Activator.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/Activator.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.ui;
@@ -36,9 +36,9 @@
// BEGIN SUPRESS CATCH EXCEPTION
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -49,7 +49,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
@Override
@@ -62,7 +62,7 @@
/**
* Returns the shared instance.
- *
+ *
* @return the shared instance
*/
public static Activator getDefault() {
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java
index 0b94b00..aacd491 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java
@@ -121,7 +121,7 @@
}
protected static void deleteRemoteProjects(ESUsersession usersession) throws IOException, FatalESException,
- ESException {
+ ESException {
for (final ESRemoteProject project : ESWorkspaceProvider.INSTANCE.getWorkspace().getServers().get(0)
.getRemoteProjects(usersession)) {
project.delete(usersession, new NullProgressMonitor());
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java
index bd147a0..c2f8967 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.ui.controllers;
@@ -318,8 +318,8 @@
getBot().waitUntil(new DefaultCondition() {
// BEGIN SUPRESS CATCH EXCEPTION
public boolean test() throws Exception {
- return getCopy().getBaseVersion().getIdentifier() ==
- getLocalProject().getBaseVersion().getIdentifier() - 1;
+ return getCopy().getBaseVersion().getIdentifier() == getLocalProject().getBaseVersion().getIdentifier()
+ - 1;
}
// END SUPRESS CATCH EXCEPTION
@@ -337,8 +337,7 @@
getBot().waitUntil(new DefaultCondition() {
// BEGIN SUPRESS CATCH EXCEPTION
public boolean test() throws Exception {
- return getCopy().getBaseVersion().getIdentifier() ==
- getLocalProject().getBaseVersion().getIdentifier();
+ return getCopy().getBaseVersion().getIdentifier() == getLocalProject().getBaseVersion().getIdentifier();
}
// END SUPRESS CATCH EXCEPTION
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommitAndBranch.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommitAndBranch.java
index 83e1efc..9e793bc 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommitAndBranch.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommitAndBranch.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/LocalProjectNeedsToBeUpdatedCommitControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/LocalProjectNeedsToBeUpdatedCommitControllerTest.java
index 9dbd2cc..504a55e 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/LocalProjectNeedsToBeUpdatedCommitControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/LocalProjectNeedsToBeUpdatedCommitControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/NoLocalChangesCommitControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/NoLocalChangesCommitControllerTest.java
index 59b2b6a..3baddb7 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/NoLocalChangesCommitControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/NoLocalChangesCommitControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -18,9 +18,9 @@
import org.junit.Test;
/**
- *
+ *
* @author emueller
- *
+ *
*/
public class NoLocalChangesCommitControllerTest extends AbstractUIControllerTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAddTagControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAddTagControllerTest.java
index 350d797..e23af7e 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAddTagControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAddTagControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.ui.controllers;
@@ -30,10 +30,11 @@
@Override
@Test
public void testController() throws ESException {
- ESPathQuery pathQuery = createTag();
- List<ESHistoryInfo> historyInfos = getLocalProject().getHistoryInfos(pathQuery, new NullProgressMonitor());
+ final ESPathQuery pathQuery = createTag();
+ final List<ESHistoryInfo> historyInfos = getLocalProject().getHistoryInfos(pathQuery,
+ new NullProgressMonitor());
assertEquals(2, historyInfos.size());
- ESHistoryInfo historyInfo2 = historyInfos.get(1);
+ final ESHistoryInfo historyInfo2 = historyInfos.get(1);
assertEquals(3, historyInfo2.getTagSpecs().size());
removeTag(historyInfo2, pathQuery);
}
@@ -41,28 +42,30 @@
private void removeTag(final ESHistoryInfo historyInfo, ESPathQuery pathQuery) throws ESException {
UIThreadRunnable.asyncExec(new VoidResult() {
public void run() {
- UIRemoveTagController removeTagController = new UIRemoveTagController(
+ final UIRemoveTagController removeTagController = new UIRemoveTagController(
getBot().getDisplay().getActiveShell(), historyInfo);
removeTagController.execute();
}
});
- List<ESHistoryInfo> historyInfos = getLocalProject().getHistoryInfos(pathQuery, new NullProgressMonitor());
+ final List<ESHistoryInfo> historyInfos = getLocalProject().getHistoryInfos(pathQuery,
+ new NullProgressMonitor());
assertEquals(2, historyInfos.size());
}
private ESPathQuery createTag() throws ESException {
- ESPrimaryVersionSpec baseVersion = getLocalProject().getBaseVersion();
+ final ESPrimaryVersionSpec baseVersion = getLocalProject().getBaseVersion();
createPlayerAndCommit();
- ESPathQuery pathQuery = ESHistoryQuery.FACTORY
+ final ESPathQuery pathQuery = ESHistoryQuery.FACTORY
.pathQuery(baseVersion, getLocalProject().getBaseVersion(), true, true);
- List<ESHistoryInfo> historyInfos = getLocalProject().getHistoryInfos(pathQuery, new NullProgressMonitor());
+ final List<ESHistoryInfo> historyInfos = getLocalProject().getHistoryInfos(pathQuery,
+ new NullProgressMonitor());
assertEquals(2, historyInfos.size());
final ESHistoryInfo historyInfo = historyInfos.get(1);
assertEquals(2, historyInfo.getTagSpecs().size());
UIThreadRunnable.asyncExec(
new VoidResult() {
public void run() {
- UIAddTagController addTagController = new UIAddTagController(
+ final UIAddTagController addTagController = new UIAddTagController(
getBot().getDisplay().getActiveShell(),
getLocalProject(), historyInfo);
addTagController.execute();
@@ -70,7 +73,7 @@
});
getBot().table(0).select(0);
- SWTBotButton button = getBot().button("OK");
+ final SWTBotButton button = getBot().button("OK");
button.click();
return pathQuery;
}
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java
index 26e82a3..5e1cc0a 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -57,7 +57,8 @@
// BEGIN SUPRESS CATCH EXCEPTION
public boolean test() throws Exception {
- for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace().getLocalProjects()) {
+ for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace()
+ .getLocalProjects()) {
if (localProject.getProjectName().equals("checkout")) {
return true;
}
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java
index 050b566..fe65e50 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.ui.controllers;
@@ -82,7 +82,8 @@
getBot().waitUntil(new DefaultCondition() {
// BEGIN SUPRESS CATCH EXCEPTION
public boolean test() throws Exception {
- for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace().getLocalProjects()) {
+ for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace()
+ .getLocalProjects()) {
if (localProject.getProjectName().equals("branch-checkout")) {
return true;
}
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java
index fbd6b96..8e7f6b1 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -52,7 +52,8 @@
// BEGIN SUPRESS CATCH EXCEPTION
public boolean test() throws Exception {
- for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace().getLocalProjects()) {
+ for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace()
+ .getLocalProjects()) {
if (localProject.getProjectName().equals("checkout")) {
if (localProject.getBaseVersion().getIdentifier() == 1) {
return true;
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICreateRemoteProjectControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICreateRemoteProjectControllerTest.java
index 21acce5..687fe89 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICreateRemoteProjectControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICreateRemoteProjectControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIDeleteRemoteProjectControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIDeleteRemoteProjectControllerTest.java
index fc95c7b..b2b3529 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIDeleteRemoteProjectControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIDeleteRemoteProjectControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIMergeControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIMergeControllerTest.java
index 55d79b8..e23ca59 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIMergeControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIMergeControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIPagedUpdateProjectControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIPagedUpdateProjectControllerTest.java
index a034887..e76d43e 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIPagedUpdateProjectControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIPagedUpdateProjectControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.ui.controllers;
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest.java
index 0666651..e399c81 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest2.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest2.java
index 3878f01..a309b7d 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest2.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIRevertCommitControllerTest2.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIServerControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIServerControllerTest.java
index d294af2..7b13690 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIServerControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIServerControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -23,9 +23,9 @@
import org.junit.Test;
/**
- *
+ *
* @author emueller
- *
+ *
*/
public class UIServerControllerTest extends AbstractUIControllerTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java
index a05da41..1eb20c6 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -21,9 +21,9 @@
/**
* Tests login/logout
- *
+ *
* @author emueller
- *
+ *
*/
public class UISessionControllerTest extends AbstractUIControllerTest {
@@ -60,8 +60,8 @@
private void logout() {
UIThreadRunnable.syncExec(new VoidResult() {
public void run() {
- logoutSessionController =
- new UILogoutSessionController(getBot().getDisplay().getActiveShell(), getUsersession());
+ logoutSessionController = new UILogoutSessionController(getBot().getDisplay().getActiveShell(),
+ getUsersession());
logoutSessionController.execute();
}
});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java
index 676b953..ebd50d8 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -21,9 +21,9 @@
/**
* Test the {@link UIShowHistoryController} by displaying the history of a certain model element.
- *
+ *
* @author emueller
- *
+ *
*/
public class UIShowHistoryControllerForElementTest extends AbstractUIControllerTestWithCommit {
@@ -35,8 +35,8 @@
UIThreadRunnable.asyncExec(new VoidResult() {
public void run() {
- final UIShowHistoryController showHistoryController =
- new UIShowHistoryController(getBot().getDisplay().getActiveShell(), player);
+ final UIShowHistoryController showHistoryController = new UIShowHistoryController(
+ getBot().getDisplay().getActiveShell(), player);
showHistoryController.execute();
}
});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java
index c783e3e..079faf5 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -20,9 +20,9 @@
/**
* Test the {@link UIShowHistoryController} by displaying the history of a certain project.
- *
+ *
* @author emueller
- *
+ *
*/
public class UIShowHistoryControllerTest extends AbstractUIControllerTestWithCommit {
@@ -33,8 +33,8 @@
createPlayerAndCommit();
UIThreadRunnable.asyncExec(new VoidResult() {
public void run() {
- final UIShowHistoryController showHistoryController =
- new UIShowHistoryController(getBot().getDisplay().getActiveShell(), getLocalProject());
+ final UIShowHistoryController showHistoryController = new UIShowHistoryController(
+ getBot().getDisplay().getActiveShell(), getLocalProject());
showHistoryController.execute();
}
});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java
index deb94f0..ec0eccc 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Johannes Faltermeier - initial API and implementation
******************************************************************************/
@@ -28,9 +28,9 @@
/**
* Tests:
* UndoLastOperationController
- *
+ *
* @author jfaltermeier
- *
+ *
*/
public class UIUndoLastOperationControllerTest extends AbstractUIControllerTest {
@@ -39,7 +39,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.client.test.ui.controllers.AbstractUIControllerTest#testController()
*/
@Override
@@ -71,7 +71,8 @@
public void run() {
final UIUndoLastOperationController undoLastOperationController = new UIUndoLastOperationController(
getBot()
- .getDisplay().getActiveShell(), getLocalProject());
+ .getDisplay().getActiveShell(),
+ getLocalProject());
undoLastOperationController.execute();
}
});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectControllerTest.java
index 7832dbc..99013c5 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -21,9 +21,9 @@
* Tests:
* UpdateProjectController
* CheckoutController
- *
+ *
* @author emueller
- *
+ *
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class UIUpdateProjectControllerTest extends AbstractUIControllerTestWithCommit {
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectToVersionControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectToVersionControllerTest.java
index b7816a4..d7adb37 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectToVersionControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUpdateProjectToVersionControllerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -30,9 +30,9 @@
* Tests:
* UpdateProjectController
* CheckoutController
- *
+ *
* @author emueller
- *
+ *
*/
@RunWith(SWTBotJunit4ClassRunner.class)
public class UIUpdateProjectToVersionControllerTest extends AbstractUIControllerTestWithCommit {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
index 43674ab..81c9a45 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.test/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
Bundle-Vendor: Eclipse Modeling Project
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.8.1,2.0.0)",
- org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.8.1,2.0.0)",
+Require-Bundle: org.eclipse.emf.emfstore.client.model.edit;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.common.model.edit;bundle-version="[1.9.0,2.0.0)",
+ org.eclipse.emf.emfstore.server.model.edit;bundle-version="[1.9.0,2.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.emfstore.client.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.test/pom.xml
index 404a523..c8d4faf 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/Activator.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/Activator.java
index a3c7f97..a651942 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/Activator.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/Activator.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test;
@@ -36,9 +36,9 @@
// BEGIN SUPRESS CATCH EXCEPTION
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
*/
@Override
@@ -49,7 +49,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
@Override
@@ -62,7 +62,7 @@
/**
* Returns the shared instance.
- *
+ *
* @return the shared instance
*/
public static Activator getDefault() {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/CommitCallbackAdapter.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/CommitCallbackAdapter.java
index 233cde2..af6afd5 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/CommitCallbackAdapter.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/CommitCallbackAdapter.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/UpdateCallbackAdapter.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/UpdateCallbackAdapter.java
index 2539465..0c49862 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/UpdateCallbackAdapter.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/UpdateCallbackAdapter.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/AllCachingTests.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/AllCachingTests.java
index ccc0a35..21d6819 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/AllCachingTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/AllCachingTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -16,7 +16,7 @@
/**
* Test Suite for running all tests of canonization.
- *
+ *
* @author koegel
*/
@RunWith(Suite.class)
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/OneToOneContainmentTest.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/OneToOneContainmentTest.java
index 0061582..fc26fb7 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/OneToOneContainmentTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/caching/OneToOneContainmentTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* koegel
******************************************************************************/
@@ -22,7 +22,7 @@
/**
* Tests the Attribute Operation.
- *
+ *
* @author koegel
*/
public class OneToOneContainmentTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/AllCommonTests.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/AllCommonTests.java
index 705d501..d31744d 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/AllCommonTests.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/AllCommonTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Otto von Wesendonk, Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -18,7 +18,7 @@
/**
* Test suite for common functionality used by the server as well as the client.
- *
+ *
* @author ovonwesen
* @author emueller
*/
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/ProjectCacheTest.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/ProjectCacheTest.java
index e1b4a17..ed80951 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/ProjectCacheTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/ProjectCacheTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.common;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/extensionregistry/ExtensionRegistryTest.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/extensionregistry/ExtensionRegistryTest.java
index ca6055b..cfb9265 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/extensionregistry/ExtensionRegistryTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/extensionregistry/ExtensionRegistryTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.common.extensionregistry;
@@ -37,35 +37,35 @@
@Test
public void testGetType() {
- Bar bar = ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class);
+ final Bar bar = ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class);
assertEquals(null, bar);
}
@Test
public void testGetTypeWithDefault() {
- Bar bar = new Bar();
- Bar defaultBar = ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class, bar, false);
+ final Bar bar = new Bar();
+ final Bar defaultBar = ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class, bar, false);
assertEquals(bar, defaultBar);
}
@Test
public void testRegisterType() {
- Bar bar = new Bar();
+ final Bar bar = new Bar();
ExtensionRegistry.INSTANCE.set("foo.bar", bar);
assertEquals(bar, ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class));
}
@Test
public void testGetTypeWithDefaultAndSetItAsDefault() {
- Bar bar = new Bar();
- Bar defaultBar = ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class, bar, true);
+ final Bar bar = new Bar();
+ final Bar defaultBar = ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class, bar, true);
assertEquals(bar, defaultBar);
assertEquals(bar, ExtensionRegistry.INSTANCE.get("foo.bar", Bar.class));
}
@Test
public void testGetExtensionElement() {
- ESLocationProvider locationProvider = ExtensionRegistry.INSTANCE.get(
+ final ESLocationProvider locationProvider = ExtensionRegistry.INSTANCE.get(
"org.eclipse.emf.emfstore.server.locationProvider.providerClass",
ESLocationProvider.class);
assertNotNull(locationProvider);
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/A.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/A.java
index 47685a7..e9cb9d2 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/A.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/A.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/AImpl.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/AImpl.java
index 8e37730..44cf05b 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/AImpl.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/AImpl.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/C.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/C.java
index de2f03c..480de38 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/C.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/C.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/DImpl.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/DImpl.java
index 2714011..4ae3b86 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/DImpl.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/DImpl.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets;
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/IAppendItem.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/IAppendItem.java
index 19cab00..76d9ae0 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/IAppendItem.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/IAppendItem.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -17,16 +17,16 @@
/**
* @author Edgar
- *
+ *
*/
public interface IAppendItem extends ESObserver {
/**
* Appends an item to the given list of items and returns a new list.
- *
+ *
* @param items
* the current list of items
- *
+ *
*/
void appendItem(List<String> items);
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/P.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/P.java
index 6c56d96..6312a8b 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/P.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/P.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -15,9 +15,9 @@
/**
* Custom prioritized observer.
- *
+ *
* @author emueller
- *
+ *
*/
public interface P extends IAppendItem, ESPrioritizedObserver {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/PImpl.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/PImpl.java
index c2a1730..c26912a 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/PImpl.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/PImpl.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -15,15 +15,15 @@
/**
* Implementation of an prioritized observer with priority 1.
- *
+ *
* @author emueller
- *
+ *
*/
public class PImpl implements P {
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.common.observer.ESPrioritizedObserver#getPriority()
*/
public int getPriority() {
@@ -31,9 +31,9 @@
}
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets.IAppendItem#appendItem(java.util.List)
*/
public void appendItem(List<String> items) {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/QImpl.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/QImpl.java
index 09cdc27..12fee6b 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/QImpl.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/QImpl.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -15,15 +15,15 @@
/**
* Implementation of an prioritized observer with priority 0;
- *
+ *
* @author emueller
- *
+ *
*/
public class QImpl implements P {
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.common.observer.ESPrioritizedObserver#getPriority()
*/
public int getPriority() {
@@ -31,9 +31,9 @@
}
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets.IAppendItem#appendItem(java.util.List)
*/
public void appendItem(List<String> items) {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/R.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/R.java
index a028287..2252a8d 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/R.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/R.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -13,7 +13,7 @@
/**
* @author emueller
- *
+ *
*/
public interface R extends IAppendItem {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/RImpl.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/RImpl.java
index eb1e14a..a291b0e 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/RImpl.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/common/observerbus/assets/RImpl.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -14,15 +14,15 @@
import java.util.List;
/**
- *
+ *
* @author emueller
- *
+ *
*/
public class RImpl implements R {
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.test.common.observerbus.assets.IAppendItem#appendItem(java.util.List)
*/
public void appendItem(List<String> items) {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ClientLocationProvider.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ClientLocationProvider.java
index 188c40c..89fdc0c 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ClientLocationProvider.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ClientLocationProvider.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.internal.client.test.config;
@@ -16,9 +16,9 @@
public class ClientLocationProvider extends DefaultWorkspaceLocationProvider {
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.model.util.DefaultWorkspaceLocationProvider#getRootDirectory()
*/
@Override
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ServerLocationProvider.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ServerLocationProvider.java
index f9b79e8..fb383d5 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ServerLocationProvider.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/config/ServerLocationProvider.java
@@ -18,7 +18,7 @@
/**
*
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.server.DefaultServerWorkspaceLocationProvider#getRootDirectory()
*/
@Override
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/persistence/FeatureMapPersistenceTest.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/persistence/FeatureMapPersistenceTest.java
index 4d1eae4..834a144 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/persistence/FeatureMapPersistenceTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/persistence/FeatureMapPersistenceTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Johannes Faltermeier - initial API and implementation
******************************************************************************/
@@ -30,9 +30,9 @@
/**
* Test for bug 428911. Saving should not cause an Exception.
- *
+ *
* @author jfaltermeier
- *
+ *
*/
public class FeatureMapPersistenceTest extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/workspace/ThreadLocalWorkSpaceTest.java b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/workspace/ThreadLocalWorkSpaceTest.java
index 25f98ec..d3e4d95 100644
--- a/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/workspace/ThreadLocalWorkSpaceTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test/src/org/eclipse/emf/emfstore/internal/client/test/workspace/ThreadLocalWorkSpaceTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* neilmack - initial API and implementation
******************************************************************************/
@@ -18,7 +18,7 @@
/**
* @author neilmack
- *
+ *
*/
public class ThreadLocalWorkSpaceTest {
@@ -41,7 +41,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see java.lang.Thread#run()
*/
@Override
@@ -63,7 +63,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see java.lang.Thread#run()
*/
@Override
diff --git a/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.client.ui.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
index 7f97356..0825415 100644
--- a/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.client.ui.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Client UI Tests
Bundle-SymbolicName: org.eclipse.emf.emfstore.client.ui.test
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="[1.8.1,2.0.0)"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client.ui;bundle-version="[1.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.emfstore.client.ui.test;version="1.8.1
+Export-Package: org.eclipse.emf.emfstore.client.ui.test;version="1.9.0
";x-internal:=true,org.eclipse.emf.emfstore.internal.client.ui.common
- ;version="1.8.1";x-internal:=true
+ ;version="1.9.0";x-internal:=true
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)"
diff --git a/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml b/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
index bb3c6c9..a7e2876 100644
--- a/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.client.ui.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.client.ui.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.jdt.ui.prefs
index 791508d..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.jdt.ui.prefs
@@ -1,115 +1,127 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
-cleanup.format_source_code=true
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=true
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=true
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=false
-cleanup.remove_unnecessary_nls_tags=false
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=true
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=true
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_esmCleanUp
-cleanup_settings_version=2
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-formatter_profile=_esmFormatter
-formatter_settings_version=12
-org.eclipse.jdt.ui.exception.name=ex
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=true
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=true
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=true
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=false
-sp_cleanup.remove_unnecessary_nls_tags=true
-sp_cleanup.remove_unused_imports=true
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=true
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=true
-sp_cleanup.use_this_for_non_static_field_access=true
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=true
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.add_default_serial_version_id=true
+cleanup.add_generated_serial_version_id=false
+cleanup.add_missing_annotations=true
+cleanup.add_missing_deprecated_annotations=true
+cleanup.add_missing_methods=false
+cleanup.add_missing_nls_tags=false
+cleanup.add_missing_override_annotations=true
+cleanup.add_missing_override_annotations_interface_methods=true
+cleanup.add_serial_version_id=false
+cleanup.always_use_blocks=true
+cleanup.always_use_parentheses_in_expressions=false
+cleanup.always_use_this_for_non_static_field_access=false
+cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
+cleanup.convert_to_enhanced_for_loop=false
+cleanup.correct_indentation=false
+cleanup.format_source_code=true
+cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
+cleanup.make_local_variable_final=true
+cleanup.make_parameters_final=false
+cleanup.make_private_fields_final=true
+cleanup.make_type_abstract_if_missing_method=false
+cleanup.make_variable_declarations_final=true
+cleanup.never_use_blocks=false
+cleanup.never_use_parentheses_in_expressions=true
+cleanup.organize_imports=true
+cleanup.qualify_static_field_accesses_with_declaring_class=false
+cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+cleanup.qualify_static_member_accesses_with_declaring_class=true
+cleanup.qualify_static_method_accesses_with_declaring_class=false
+cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
+cleanup.remove_trailing_whitespaces=true
+cleanup.remove_trailing_whitespaces_all=true
+cleanup.remove_trailing_whitespaces_ignore_empty=false
+cleanup.remove_unnecessary_casts=false
+cleanup.remove_unnecessary_nls_tags=false
+cleanup.remove_unused_imports=true
+cleanup.remove_unused_local_variables=false
+cleanup.remove_unused_private_fields=true
+cleanup.remove_unused_private_members=false
+cleanup.remove_unused_private_methods=true
+cleanup.remove_unused_private_types=true
+cleanup.sort_members=false
+cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
+cleanup.use_blocks=true
+cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
+cleanup.use_parentheses_in_expressions=true
+cleanup.use_this_for_non_static_field_access=true
+cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+cleanup.use_this_for_non_static_method_access=true
+cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
+cleanup_profile=_esmCleanUp
+cleanup_settings_version=2
+eclipse.preferences.version=1
+editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
+formatter_profile=_esmFormatter
+formatter_settings_version=12
+org.eclipse.jdt.ui.exception.name=ex
+org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=true
+org.eclipse.jdt.ui.keywordthis=false
+org.eclipse.jdt.ui.overrideannotation=true
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\r\n * @return the ${bare_field_name}\r\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\r\n * @param ${param} the ${bare_field_name} to set\r\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/*******************************************************************************\r\n * Copyright (c) 2011-${year} EclipseSource Muenchen GmbH and others.\r\n * \r\n * All rights reserved. This program and the accompanying materials\r\n * are made available under the terms of the Eclipse Public License v1.0\r\n * which accompanies this distribution, and is available at\r\n * http\://www.eclipse.org/legal/epl-v10.html\r\n * \r\n * Contributors\:\r\n * ${user} - initial API and implementation\r\n ******************************************************************************/</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment"/><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\r\n * ${tags}\r\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\r\n * {@inheritDoc}\r\n * ${see_to_overridden}\r\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\r\n * ${tags}\r\n * ${see_to_target}\r\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\r\n${package_declaration}\r\n\r\n${typecomment}\r\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\r\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\r\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\r\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\r\n</template><template autoinsert\="false" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">\t\t\t// TODO Auto-generated catch block\r\n\t\t\t// Do NOT catch all Exceptions ("catch (Exception e)")\r\n\t\t\t// Log AND handle Exceptions if possible \r\n //\r\n // You can just uncomment one of the lines below to log an exception\:\r\n\t\t\t// logException will show the logged excpetion to the user\r\n\t\t\t// ModelUtil.logException(${exception_var});\r\n\t\t\t// ModelUtil.logException("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// logWarning will only add the message to the error log\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE", ${exception_var});\r\n\t\t\t// ModelUtil.logWarning("YOUR MESSAGE HERE");\r\n\t\t\t//\t\t\t\r\n\t\t\t// If handling is not possible declare and rethrow Exception</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\r\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\r\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+sp_cleanup.add_default_serial_version_id=true
+sp_cleanup.add_generated_serial_version_id=false
+sp_cleanup.add_missing_annotations=true
+sp_cleanup.add_missing_deprecated_annotations=true
+sp_cleanup.add_missing_methods=false
+sp_cleanup.add_missing_nls_tags=false
+sp_cleanup.add_missing_override_annotations=true
+sp_cleanup.add_missing_override_annotations_interface_methods=true
+sp_cleanup.add_serial_version_id=false
+sp_cleanup.always_use_blocks=true
+sp_cleanup.always_use_parentheses_in_expressions=false
+sp_cleanup.always_use_this_for_non_static_field_access=false
+sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
+sp_cleanup.convert_to_enhanced_for_loop=false
+sp_cleanup.correct_indentation=false
+sp_cleanup.format_source_code=true
+sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
+sp_cleanup.make_local_variable_final=true
+sp_cleanup.make_parameters_final=false
+sp_cleanup.make_private_fields_final=true
+sp_cleanup.make_type_abstract_if_missing_method=false
+sp_cleanup.make_variable_declarations_final=true
+sp_cleanup.never_use_blocks=false
+sp_cleanup.never_use_parentheses_in_expressions=true
+sp_cleanup.on_save_use_additional_actions=true
+sp_cleanup.organize_imports=true
+sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
+sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
+sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
+sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
+sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
+sp_cleanup.remove_trailing_whitespaces=true
+sp_cleanup.remove_trailing_whitespaces_all=true
+sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
+sp_cleanup.remove_unnecessary_casts=false
+sp_cleanup.remove_unnecessary_nls_tags=true
+sp_cleanup.remove_unused_imports=true
+sp_cleanup.remove_unused_local_variables=false
+sp_cleanup.remove_unused_private_fields=true
+sp_cleanup.remove_unused_private_members=false
+sp_cleanup.remove_unused_private_methods=true
+sp_cleanup.remove_unused_private_types=true
+sp_cleanup.sort_members=false
+sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
+sp_cleanup.use_blocks=true
+sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
+sp_cleanup.use_parentheses_in_expressions=true
+sp_cleanup.use_this_for_non_static_field_access=true
+sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
+sp_cleanup.use_this_for_non_static_method_access=true
+sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
index 8da428e..314adad 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/src/org/eclipse/emf/emfstore/fuzzy/emf/diff/test/CreateAllDiffsSuite.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/src/org/eclipse/emf/emfstore/fuzzy/emf/diff/test/CreateAllDiffsSuite.java
index 23ca97c..b227be3 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/src/org/eclipse/emf/emfstore/fuzzy/emf/diff/test/CreateAllDiffsSuite.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.diff.test/src/org/eclipse/emf/emfstore/fuzzy/emf/diff/test/CreateAllDiffsSuite.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -19,7 +19,7 @@
/**
* @author Edgar
- *
+ *
*/
@RunWith(FilteredSuite.class)
@FilteredSuiteParameter({ "createDiffs" })
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
index f90bd90..e599cec 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/AllFuzzyTests.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/AllFuzzyTests.java
index 2d679ab..0ad7400 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/AllFuzzyTests.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/AllFuzzyTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* JulianSommerfeldt
******************************************************************************/
@@ -18,9 +18,9 @@
/**
* Suite for all fuzzy tests.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
@RunWith(FilteredSuite.class)
@FilteredSuiteParameter({ "runFuzzyTests" })
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
index cad68c1..6190280 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* JulianSommerfeldt
******************************************************************************/
@@ -26,9 +26,9 @@
/**
* ESFuzzyTest to run bigger {@link ESModelMutatorConfiguration}s.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
@RunWith(ESFuzzyRunner.class)
@DataProvider(ESEMFDataProvider.class)
@@ -43,8 +43,7 @@
/***/
@Test
public void createModel() {
- final ESModelMutatorConfiguration config =
- new ESModelMutatorConfiguration(util.getEPackages(), root, 1L);
+ final ESModelMutatorConfiguration config = new ESModelMutatorConfiguration(util.getEPackages(), root, 1L);
config.setMinObjectsCount(util.getMinObjectsCount());
ESDefaultModelMutator.changeModel(config);
// TODO: no assert here..
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
index 2be261b..96cdf76 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
@@ -84,10 +84,10 @@
final Project clonedProject = EcoreUtil.copy(project);
- final ESCrossResourceReferencesModelMutator mutator =
- new ESCrossResourceReferencesModelMutator(getConfig(project));
- final ESCrossResourceReferencesModelMutator secondMutator =
- new ESCrossResourceReferencesModelMutator(getConfig(clonedProject));
+ final ESCrossResourceReferencesModelMutator mutator = new ESCrossResourceReferencesModelMutator(
+ getConfig(project));
+ final ESCrossResourceReferencesModelMutator secondMutator = new ESCrossResourceReferencesModelMutator(
+ getConfig(clonedProject));
mutator.mutateUntil(ESPredicates.hasExternalReference());
secondMutator.mutateUntil(ESPredicates.hasExternalReference());
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
index ebc4ef6..fc6786d 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -17,16 +17,16 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* Test that verifies the configuration parameters read from the fuzzy config.
- *
+ *
* @author emueller
- *
+ *
*/
@RunWith(ESFuzzyRunner.class)
@DataProvider(ESEMFDataProvider.class)
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
index 39219b9..a5b6f94 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
@@ -70,7 +70,7 @@
{
put(ESEMFDataProvider.MUTATOR_EDITINGDOMAIN,
((ESWorkspaceProviderImpl) ESWorkspaceProvider.INSTANCE)
- .getEditingDomain());
+ .getEditingDomain());
}
};
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
index 6f2e216..7713af5 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* JulianSommerfeldt
******************************************************************************/
@@ -19,11 +19,11 @@
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
import org.eclipse.emf.emfstore.fuzzy.emf.ESMutateUtil;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESDefaultModelMutator;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Data;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Util;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESDefaultModelMutator;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.internal.common.model.ModelFactory;
import org.eclipse.emf.emfstore.internal.common.model.ModelPackage;
import org.eclipse.emf.emfstore.internal.common.model.Project;
@@ -34,9 +34,9 @@
/**
* ESFuzzyTest to test the {@link ESDefaultModelMutator}.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
@RunWith(ESFuzzyRunner.class)
@DataProvider(ESEMFDataProvider.class)
@@ -50,7 +50,7 @@
/**
* Tests if two generated models are equal.
- *
+ *
* @throws SerializationException
*/
@Test
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
index cac0b96..fe97e82 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Julian Sommerfeldt - initial API and implementation
* Edgar Mueller - bug fixing
@@ -13,8 +13,8 @@
package org.eclipse.emf.emfstore.fuzzy.emf.test;
import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceBase;
import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreCommand;
import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorConfiguration;
@@ -23,9 +23,9 @@
/**
* Fuzzy ESFuzzyTest for the reverse functionality of operations.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
@RunWith(ESFuzzyRunner.class)
@DataProvider(ESEMFDataProvider.class)
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
index 9ee2528..01e8e70 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* JulianSommerfeldt
******************************************************************************/
@@ -16,8 +16,8 @@
import org.eclipse.emf.emfstore.client.util.ESVoidCallable;
import org.eclipse.emf.emfstore.client.util.RunESCommand;
import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
import org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl;
@@ -28,9 +28,9 @@
/**
* Class to test serialization functionality of the {@link ESWorkspaceProvider}.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
@RunWith(ESFuzzyRunner.class)
@DataProvider(ESEMFDataProvider.class)
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
index 18c0149..7a065fd 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* JulianSommerfeldt
******************************************************************************/
@@ -18,10 +18,10 @@
import org.eclipse.emf.emfstore.client.util.RunESCommand;
import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
import org.eclipse.emf.emfstore.fuzzy.emf.ESMutateUtil;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Data;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Util;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
import org.eclipse.emf.emfstore.internal.common.model.Project;
import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorConfiguration;
@@ -32,9 +32,9 @@
/**
* Fuzzy Server test to test share, checkout, commit and update.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
@RunWith(ESFuzzyRunner.class)
@DataProvider(ESEMFDataProvider.class)
diff --git a/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.migration.edapt.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
index 3bf4793..9f3b525 100644
--- a/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.migration.edapt.test/META-INF/MANIFEST.MF
@@ -2,24 +2,24 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.emfstore.migration.edapt.test;singleton:=true
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-ClassPath: .
-Fragment-Host: org.eclipse.emf.emfstore.migration.edapt;bundle-version="[1.8.1,2.0.0)"
+Fragment-Host: org.eclipse.emf.emfstore.migration.edapt;bundle-version="[1.9.0,2.0.0)"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.emf.emfstore.internal.migration.edapt;vers
- ion="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.internal.migrat
- ion.edapt.test;version="1.8.1";x-internal:=true,org.eclipse.emf.emfst
- ore.migration.edapt.test.model.a.model;version="1.8.1",org.eclipse.em
- f.emfstore.migration.edapt.test.model.a.model.impl;version="1.8.1",or
+ ion="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.internal.migrat
+ ion.edapt.test;version="1.9.0";x-internal:=true,org.eclipse.emf.emfst
+ ore.migration.edapt.test.model.a.model;version="1.9.0",org.eclipse.em
+ f.emfstore.migration.edapt.test.model.a.model.impl;version="1.9.0",or
g.eclipse.emf.emfstore.migration.edapt.test.model.a.model.util;versio
- n="1.8.1",org.eclipse.emf.emfstore.migration.edapt.test.model.d.model
- ;version="1.8.1",org.eclipse.emf.emfstore.migration.edapt.test.model.
- d.model.impl;version="1.8.1",org.eclipse.emf.emfstore.migration.edapt
- .test.model.d.model.util;version="1.8.1"
+ n="1.9.0",org.eclipse.emf.emfstore.migration.edapt.test.model.d.model
+ ;version="1.9.0",org.eclipse.emf.emfstore.migration.edapt.test.model.
+ d.model.impl;version="1.9.0",org.eclipse.emf.emfstore.migration.edapt
+ .test.model.d.model.util;version="1.9.0"
Require-Bundle: org.junit;bundle-version="[4.0.0,5.0.0)",
org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml b/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
index c0529bb..e8deaa4 100644
--- a/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.migration.edapt.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.migration.edapt.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs
index 99f26c0..f548abb 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,6 @@
eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
encoding/<project>=UTF-8
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.core.runtime.prefs
rename to tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.runtime.prefs
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs
index af0f20f..edbd6f6 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=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=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.launching.prefs
rename to tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.launching.prefs
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 94%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs
copy to tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.ltk.core.refactoring.prefs
rename to tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.api.tools.prefs
rename to tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.prefs
rename to tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java
index f966ed3..8232e97 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java
@@ -12,12 +12,15 @@
package org.eclipse.emf.emfstore.internal.modelmutator.mutation;
-import static org.junit.Assert.*;
-import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.*;
+import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.IS_CONTAINMENT_REFERENCE;
+import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.hasMaxNumberOfContainments;
+import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.isListWithSpecifiedSize;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationTargetSelector;
import org.eclipse.emf.emfstore.modelmutator.ESMutationException;
import org.eclipse.emf.emfstore.modelmutator.test.AbstractMutationTest;
import org.junit.Test;
@@ -31,8 +34,7 @@
@Test
public void isSelectionValidForInvalidCombinationOfFeatureAndObject() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetFeature(E_PACKAGE.getEEnum_ELiterals());
selector.setTargetObject(ePackageWithTwoClasses);
assertFalse(selector.isValid());
@@ -40,29 +42,24 @@
@Test
public void isSelectionValidForValidCombinationOfFeatureAndObject() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
- selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
- .get(0));
+ selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
assertTrue(selector.isValid());
}
@Test
public void isSelectionValidForInvalidTargetFeaturePredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
selector.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
- selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
- .get(0));
+ selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
assertFalse(selector.isValid());
}
@Test
public void isSelectionValidForInvalidTargetObjectPredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(1));
selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
selector.setTargetObject(ePackageWithTwoClasses);
@@ -71,21 +68,17 @@
@Test
public void isSelectionValidForValidTargetObjectButInvalidTargetFeaturePredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
- selector.getTargetFeaturePredicates()
- .add(hasMaxNumberOfContainments(1));
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
+ selector.getTargetFeaturePredicates().add(hasMaxNumberOfContainments(1));
selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
selector.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
- selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
- .get(0));
+ selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
assertFalse(selector.isValid());
}
@Test
public void isSelectionValidForInvalidTargetObjectButValidTargetFeaturePredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(0));
selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
@@ -95,84 +88,70 @@
@Test
public void isSelectionValidForValidTargetObjectPredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(0));
selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
selector.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures());
- selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
- .get(0));
+ selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
assertTrue(selector.isValid());
}
@Test
public void isSelectionValidForInvalidOriginalFeatureValuePredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
selector.setTargetObject(ePackageWithTwoClasses);
- selector.getOriginalFeatureValuePredicates().add(
- isListWithSpecifiedSize(0));
+ selector.getOriginalFeatureValuePredicates().add(isListWithSpecifiedSize(0));
assertFalse(selector.isValid());
}
@Test
public void isSelectionValidForValidOriginalFeatureValuePredicate() {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
selector.setTargetObject(ePackageWithTwoClasses);
- selector.getOriginalFeatureValuePredicates().add(
- isListWithSpecifiedSize(2));
+ selector.getOriginalFeatureValuePredicates().add(isListWithSpecifiedSize(2));
assertTrue(selector.isValid());
}
@Test
public void findingTargetObjectByFeature() throws ESMutationException {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
selector.doSelection();
EObject targetObject = selector.getTargetObject();
assertEquals(ePackageWithTwoClasses, targetObject);
- assertEquals(E_PACKAGE.getEPackage_EClassifiers(),
- selector.getTargetFeature());
+ assertEquals(E_PACKAGE.getEPackage_EClassifiers(), selector.getTargetFeature());
selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures());
selector.doSelection();
targetObject = selector.getTargetObject();
- assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
- targetObject));
- assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(),
- selector.getTargetFeature());
+ assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(targetObject));
+ assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), selector.getTargetFeature());
}
@Test
public void findingTargetFeatureByObject() throws ESMutationException {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.setTargetObject(ePackageWithTwoClasses);
selector.doSelection();
- EStructuralFeature targetFeature = selector.getTargetFeature();
- assertTrue(ePackageWithTwoClasses.eClass().getEAllStructuralFeatures()
- .contains(targetFeature));
+ final EStructuralFeature targetFeature = selector.getTargetFeature();
+ assertTrue(ePackageWithTwoClasses.eClass().getEAllStructuralFeatures().contains(targetFeature));
assertEquals(ePackageWithTwoClasses, selector.getTargetObject());
}
@Test
- public void findingTargetFeatureAndTargetObjectByPredicates()
- throws ESMutationException {
- MutationTargetSelector selector = new MutationTargetSelector(
- utilForEPackageWithTwoClasses);
+ public void findingTargetFeatureAndTargetObjectByPredicates() throws ESMutationException {
+ final MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(0));
selector.doSelection();
- EObject targetObject = selector.getTargetObject();
- EStructuralFeature targetReference = selector.getTargetFeature();
+ final EObject targetObject = selector.getTargetObject();
+ final EStructuralFeature targetReference = selector.getTargetFeature();
assertTrue(IS_CONTAINMENT_REFERENCE.apply(targetReference));
assertTrue(hasMaxNumberOfContainments(0).apply(targetObject));
}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java
index df07163..d1c3012 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java
@@ -20,8 +20,8 @@
import org.eclipse.emf.ecore.EcoreFactory;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.emfstore.internal.modelmutator.mutation.Mutation;
-import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorUtil;
import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorConfiguration;
+import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorUtil;
import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
@@ -30,7 +30,7 @@
/**
* Abstract test case providing common functionalities for all unit tests of
* {@link Mutation mutations}.
- *
+ *
* @author Philip Langer
*/
@SuppressWarnings("restriction")
@@ -50,35 +50,32 @@
@Before
public void setUp() {
- this.ePackageWithTwoClasses = createRootEPackageWithTwoClasses();
- this.utilForEPackageWithTwoClasses = createMutationUtil(this.ePackageWithTwoClasses);
- this.testTypeModel = createTestTypeModel();
- this.utilForTestTypeModel = createMutationUtil(this.testTypeModel);
+ ePackageWithTwoClasses = createRootEPackageWithTwoClasses();
+ utilForEPackageWithTwoClasses = createMutationUtil(ePackageWithTwoClasses);
+ testTypeModel = createTestTypeModel();
+ utilForTestTypeModel = createMutationUtil(testTypeModel);
}
private EPackage createRootEPackageWithTwoClasses() {
- EPackage rootEPackage = E_FACTORY.createEPackage();
- EClass eClass1 = E_FACTORY.createEClass();
- EClass eClass2 = E_FACTORY.createEClass();
+ final EPackage rootEPackage = E_FACTORY.createEPackage();
+ final EClass eClass1 = E_FACTORY.createEClass();
+ final EClass eClass2 = E_FACTORY.createEClass();
rootEPackage.getEClassifiers().add(eClass1);
rootEPackage.getEClassifiers().add(eClass2);
return rootEPackage;
}
private TypeWithFeatureMapContainment createTestTypeModel() {
- TestmodelFactory tFactory = TestmodelFactory.eINSTANCE;
+ final TestmodelFactory tFactory = TestmodelFactory.eINSTANCE;
- TypeWithFeatureMapContainment root = tFactory
- .createTypeWithFeatureMapContainment();
+ final TypeWithFeatureMapContainment root = tFactory.createTypeWithFeatureMapContainment();
root.setName("Root");
- TypeWithFeatureMapContainment child1 = tFactory
- .createTypeWithFeatureMapContainment();
+ final TypeWithFeatureMapContainment child1 = tFactory.createTypeWithFeatureMapContainment();
child1.setName("Child2Containment");
root.getSecondKeyContainment().add(child1);
- TypeWithFeatureMapNonContainment child2 = tFactory
- .createTypeWithFeatureMapNonContainment();
+ final TypeWithFeatureMapNonContainment child2 = tFactory.createTypeWithFeatureMapNonContainment();
child2.setName("Child1NonContainment");
child2.getFirstKey().add(root);
child2.getSecondKey().add(child2);
@@ -88,8 +85,8 @@
}
private ESModelMutatorUtil createMutationUtil(EObject rootEObject) {
- ESModelMutatorConfiguration config = new ESModelMutatorConfiguration();
- List<EPackage> modelPackages = new ArrayList<EPackage>();
+ final ESModelMutatorConfiguration config = new ESModelMutatorConfiguration();
+ final List<EPackage> modelPackages = new ArrayList<EPackage>();
modelPackages.add(rootEObject.eClass().getEPackage());
config.setModelPackages(modelPackages);
config.setRootEObject(rootEObject);
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java
index 49dc73e..a087588 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java
@@ -28,18 +28,16 @@
/**
* Unit tests for {@link ESAddObjectMutation}.
- *
+ *
* @author Philip Langer
*/
public class AddObjectMutationTest extends AbstractMutationTest {
@Test
- public void addObjectForGivenFeatureAndContainer()
- throws ESMutationException {
+ public void addObjectForGivenFeatureAndContainer() throws ESMutationException {
- ESMutationFactory.add(utilForEPackageWithTwoClasses)
- .setTargetObject(ePackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+ ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetObject(ePackageWithTwoClasses)
+ .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
assertEquals(3, ePackageWithTwoClasses.getEClassifiers().size());
}
@@ -47,8 +45,8 @@
@Test
public void addObjectForGivenFeature() throws ESMutationException {
- ESMutationFactory.add(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+ ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+ .apply();
// we only have one possible target container with the given feature
// so apply() should have added one new EClassifier to it
@@ -56,12 +54,10 @@
}
@Test
- public void selectTargetContainerForGivenFeature()
- throws ESMutationException {
+ public void selectTargetContainerForGivenFeature() throws ESMutationException {
- ESAddObjectMutation mutation = ESMutationFactory.add(
- utilForEPackageWithTwoClasses).setTargetFeature(
- E_PACKAGE.getEPackage_EClassifiers());
+ final ESAddObjectMutation mutation = ESMutationFactory.add(utilForEPackageWithTwoClasses)
+ .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
mutation.apply();
@@ -70,30 +66,25 @@
}
@Test
- public void selectTargetFeatureForGivenTargetContainer()
- throws ESMutationException {
+ public void selectTargetFeatureForGivenTargetContainer() throws ESMutationException {
- ESAddObjectMutation mutation = ESMutationFactory.add(
- utilForEPackageWithTwoClasses).setTargetObject(
- ePackageWithTwoClasses);
+ final ESAddObjectMutation mutation = ESMutationFactory.add(utilForEPackageWithTwoClasses)
+ .setTargetObject(ePackageWithTwoClasses);
mutation.apply();
final EStructuralFeature targetFeature = mutation.getTargetFeature();
final EClass targetContainerClass = ePackageWithTwoClasses.eClass();
- final EList<EReference> allContainmentFeatures = targetContainerClass
- .getEAllContainments();
+ final EList<EReference> allContainmentFeatures = targetContainerClass.getEAllContainments();
assertTrue(allContainmentFeatures.contains(targetFeature));
}
@Test
- public void selectTargetFeatureAndContainerForGivenEObjectToAdd()
- throws ESMutationException {
+ public void selectTargetFeatureAndContainerForGivenEObjectToAdd() throws ESMutationException {
- ESAddObjectMutation mutation = ESMutationFactory.add(
- utilForEPackageWithTwoClasses).setEObjectToAdd(
- E_FACTORY.createEAttribute());
+ final ESAddObjectMutation mutation = ESMutationFactory.add(utilForEPackageWithTwoClasses)
+ .setEObjectToAdd(E_FACTORY.createEAttribute());
mutation.apply();
@@ -103,8 +94,7 @@
assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), targetFeature);
assertEquals(E_PACKAGE.getEClass(), targetContainer.eClass());
- assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
- realContainer));
+ assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(realContainer));
}
@Test
@@ -116,22 +106,18 @@
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfNoValidTargetContainerIsAvailable()
- throws ESMutationException {
+ public void throwsExceptionIfNoValidTargetContainerIsAvailable() throws ESMutationException {
- ESMutationFactory.add(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
+ ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
fail("Should have thrown a Mutation Exception, because there is no valid target container.");
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfSelectionOfTargetContainerIsImpossible()
- throws ESMutationException {
+ public void throwsExceptionIfSelectionOfTargetContainerIsImpossible() throws ESMutationException {
- ESMutationFactory.add(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
- .setTargetObject(ePackageWithTwoClasses).apply();
+ ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
+ .setTargetObject(ePackageWithTwoClasses).apply();
fail("Should have thrown a Mutation Exception, because there is no valid target container.");
}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java
index c1f10c9..803c7eb 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java
@@ -6,10 +6,9 @@
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses({ AddObjectMutationTest.class, AttributeChangeMutationTest.class,
- DeleteObjectMutationTest.class, FeatureMapKeyMutationTest.class,
- MoveObjectMutationTest.class, MutationTargetSelectorTest.class,
- ReferenceChangeMutationTest.class })
+@SuiteClasses({ AddObjectMutationTest.class, AttributeChangeMutationTest.class, DeleteObjectMutationTest.class,
+ FeatureMapKeyMutationTest.class, MoveObjectMutationTest.class, MutationTargetSelectorTest.class,
+ ReferenceChangeMutationTest.class })
public class AllMutationTests {
}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java
index 64bc36d..3e49bb3 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java
@@ -31,70 +31,55 @@
/**
* Unit tests for {@link ESAttributeChangeMutation}.
- *
+ *
* @author Philip Langer
*/
public class AttributeChangeMutationTest extends AbstractMutationTest {
@Test
- public void addValueForGivenAttributeAndContainer()
- throws ESMutationException {
+ public void addValueForGivenAttributeAndContainer() throws ESMutationException {
- ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
- .setNewValue("TEST")
- .setRandomChangeMode(ESRandomChangeMode.ADD)
- .setTargetObject(ePackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
+ ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses).setNewValue("TEST")
+ .setRandomChangeMode(ESRandomChangeMode.ADD).setTargetObject(ePackageWithTwoClasses)
+ .setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
assertEquals("TEST", ePackageWithTwoClasses.getNsURI());
}
@Test
- public void unsetSingleValuedAttributeForGivenAttributeAndContainer()
- throws ESMutationException {
+ public void unsetSingleValuedAttributeForGivenAttributeAndContainer() throws ESMutationException {
ePackageWithTwoClasses.setNsURI("TEST");
- ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.DELETE)
- .setTargetObject(ePackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
+ ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.DELETE)
+ .setTargetObject(ePackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
assertNull(ePackageWithTwoClasses.getNsURI());
- assertFalse(ePackageWithTwoClasses
- .eIsSet(E_PACKAGE.getEPackage_NsURI()));
+ assertFalse(ePackageWithTwoClasses.eIsSet(E_PACKAGE.getEPackage_NsURI()));
}
@Test
- public void selectTargetContainerForGivenFeature()
- throws ESMutationException {
+ public void selectTargetContainerForGivenFeature() throws ESMutationException {
- ESAttributeChangeMutation mutation = ESMutationFactory
- .attributeChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.ADD)
- .setTargetFeature(E_PACKAGE.getEClass_Abstract());
+ final ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.ADD).setTargetFeature(E_PACKAGE.getEClass_Abstract());
mutation.apply();
assertEquals(E_PACKAGE.getEClass(), mutation.getTargetObject().eClass());
- assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
- mutation.getTargetObject()));
+ assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(mutation.getTargetObject()));
}
@Test
- public void selectTargetFeatureForGivenTargetContainer()
- throws ESMutationException {
+ public void selectTargetFeatureForGivenTargetContainer() throws ESMutationException {
- ESAttributeChangeMutation mutation = ESMutationFactory
- .attributeChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.ADD)
- .setTargetObject(ePackageWithTwoClasses);
+ final ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.ADD).setTargetObject(ePackageWithTwoClasses);
mutation.apply();
final EStructuralFeature targetFeature = mutation.getTargetFeature();
final EClass targetContainerClass = ePackageWithTwoClasses.eClass();
- final EList<EAttribute> allAttributes = targetContainerClass
- .getEAllAttributes();
+ final EList<EAttribute> allAttributes = targetContainerClass.getEAllAttributes();
assertTrue(allAttributes.contains(targetFeature));
}
@@ -102,9 +87,8 @@
@Test
public void addObject() throws ESMutationException {
- ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(
- utilForEPackageWithTwoClasses).setRandomChangeMode(
- ESRandomChangeMode.ADD);
+ final ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.ADD);
mutation.apply();
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java
index 45a41b5..3473ccb 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java
@@ -27,18 +27,16 @@
/**
* Unit tests for {@link ESDeleteObjectMutation}.
- *
+ *
* @author Philip Langer
*/
public class DeleteObjectMutationTest extends AbstractMutationTest {
@Test
- public void deleteObjectForGivenFeatureAndGivenContainer()
- throws ESMutationException {
+ public void deleteObjectForGivenFeatureAndGivenContainer() throws ESMutationException {
- ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setTargetObject(ePackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+ ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetObject(ePackageWithTwoClasses)
+ .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
assertEquals(1, ePackageWithTwoClasses.getEClassifiers().size());
}
@@ -46,8 +44,8 @@
@Test
public void deleteObjectForGivenFeature() throws ESMutationException {
- ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+ ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+ .apply();
// we only have one possible target container with the given feature
// so apply() should have added one new EClassifier to it
@@ -55,12 +53,10 @@
}
@Test
- public void selectTargetContainerForGivenFeature()
- throws ESMutationException {
+ public void selectTargetContainerForGivenFeature() throws ESMutationException {
- ESDeleteObjectMutation mutation = ESMutationFactory.delete(
- utilForEPackageWithTwoClasses).setTargetFeature(
- E_PACKAGE.getEPackage_EClassifiers());
+ final ESDeleteObjectMutation mutation = ESMutationFactory.delete(utilForEPackageWithTwoClasses)
+ .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
mutation.apply();
@@ -71,74 +67,61 @@
@Test
public void selectTargetFeatureForGivenObject() throws ESMutationException {
- ESDeleteObjectMutation mutation = ESMutationFactory.delete(
- utilForEPackageWithTwoClasses).setTargetObject(
- ePackageWithTwoClasses);
+ final ESDeleteObjectMutation mutation = ESMutationFactory.delete(utilForEPackageWithTwoClasses)
+ .setTargetObject(ePackageWithTwoClasses);
mutation.apply();
final EStructuralFeature targetFeature = mutation.getTargetFeature();
final EClass targetContainerClass = ePackageWithTwoClasses.eClass();
- final EList<EReference> allContainmentFeatures = targetContainerClass
- .getEAllContainments();
+ final EList<EReference> allContainmentFeatures = targetContainerClass.getEAllContainments();
assertTrue(allContainmentFeatures.contains(targetFeature));
}
@Test
public void deleteObject() throws ESMutationException {
- ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setMaxNumberOfContainments(1).apply();
+ ESMutationFactory.delete(utilForEPackageWithTwoClasses).setMaxNumberOfContainments(1).apply();
assertEquals(1, getAllObjectsCount(ePackageWithTwoClasses));
}
@Test
- public void deleteInGivenTargetContainerForGivenFeature()
- throws ESMutationException {
+ public void deleteInGivenTargetContainerForGivenFeature() throws ESMutationException {
- ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
- .setTargetObject(ePackageWithTwoClasses)
- .setMaxNumberOfContainments(1).apply();
+ ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+ .setTargetObject(ePackageWithTwoClasses).setMaxNumberOfContainments(1).apply();
assertEquals(1, ePackageWithTwoClasses.getEClassifiers().size());
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfNoValidTargetContainerIsAvailable()
- throws ESMutationException {
+ public void throwsExceptionIfNoValidTargetContainerIsAvailable() throws ESMutationException {
- ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
+ ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEEnum_ELiterals())
+ .apply();
- fail("Should have thrown a Mutation Exception, because there is "
- + "no valid target container.");
+ fail("Should have thrown a Mutation Exception, because there is " + "no valid target container.");
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfSelectionOfTargetContainerIsImpossible()
- throws ESMutationException {
+ public void throwsExceptionIfSelectionOfTargetContainerIsImpossible() throws ESMutationException {
ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
- .setTargetObject(ePackageWithTwoClasses).apply();
+ .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures()).setTargetObject(ePackageWithTwoClasses)
+ .apply();
- fail("Should have thrown a Mutation Exception, because there is "
- + "no valid target container.");
+ fail("Should have thrown a Mutation Exception, because there is " + "no valid target container.");
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfSelectionOfTargetContainerViolatesMaxNumberOfObjects()
- throws ESMutationException {
+ public void throwsExceptionIfSelectionOfTargetContainerViolatesMaxNumberOfObjects() throws ESMutationException {
- ESMutationFactory.delete(utilForEPackageWithTwoClasses)
- .setMaxNumberOfContainments(-1)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
- .setTargetObject(ePackageWithTwoClasses).apply();
+ ESMutationFactory.delete(utilForEPackageWithTwoClasses).setMaxNumberOfContainments(-1)
+ .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).setTargetObject(ePackageWithTwoClasses).apply();
fail("Should have thrown a Mutation Exception, because there this mutation "
- + "would delete more than the specified maximum number of objects.");
+ + "would delete more than the specified maximum number of objects.");
}
}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java
index 73f2ef0..bf152ab 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java
@@ -27,10 +27,10 @@
/**
* Unit tests for {@link FeatureMapKeyMutation}.
- *
+ *
* TODO do some more testing to make sure delegation to other mutations works
* fine
- *
+ *
* @author Philip Langer
*/
@SuppressWarnings("restriction")
@@ -39,52 +39,38 @@
private static final TestmodelPackage TEST_MODEL_PACKAGE = TestmodelPackage.eINSTANCE;
@Test
- public void runUnconfiguredFeatureMapKeyMutation()
- throws ESMutationException {
- FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
- utilForTestTypeModel);
+ public void runUnconfiguredFeatureMapKeyMutation() throws ESMutationException {
+ final FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
mutation.apply();
- EStructuralFeature feature = mutation.getTargetFeature();
- assertTrue(feature == TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapNonContainment_Map()
- || feature == TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapContainment_MapContainment());
+ final EStructuralFeature feature = mutation.getTargetFeature();
+ assertTrue(feature == TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_Map()
+ || feature == TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_MapContainment());
}
@Test
public void containmentFeatureMapKeyMutation() throws ESMutationException {
- FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
- utilForTestTypeModel);
- mutation.setTargetFeature(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapContainment_MapContainment());
+ final FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+ mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_MapContainment());
mutation.apply();
- final EList<TestType> firstKeyContainments = testTypeModel
- .getFirstKeyContainment();
- final EList<TestType> secondKeyContainments = testTypeModel
- .getSecondKeyContainment();
+ final EList<TestType> firstKeyContainments = testTypeModel.getFirstKeyContainment();
+ final EList<TestType> secondKeyContainments = testTypeModel.getSecondKeyContainment();
// originally we had one in first key and one in second key containment
// after the key change mutation, there should be two in either one of
// them
- assertTrue((firstKeyContainments.size() == 2 && secondKeyContainments
- .size() == 0)
- || (firstKeyContainments.size() == 0 && secondKeyContainments
- .size() == 2));
+ assertTrue(firstKeyContainments.size() == 2 && secondKeyContainments.size() == 0
+ || firstKeyContainments.size() == 0 && secondKeyContainments.size() == 2);
}
@Test
- public void nonContainmentFeatureMapKeyMutation()
- throws ESMutationException {
- FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
- utilForTestTypeModel);
- mutation.setTargetFeature(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapNonContainment_Map());
+ public void nonContainmentFeatureMapKeyMutation() throws ESMutationException {
+ final FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+ mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_Map());
mutation.apply();
- final EList<TestType> firstKeyContainments = testTypeModel
- .getFirstKeyContainment();
+ final EList<TestType> firstKeyContainments = testTypeModel.getFirstKeyContainment();
final TestType firstKeyContainmentsIdx0 = firstKeyContainments.get(0);
final TypeWithFeatureMapNonContainment mutationTarget = (TypeWithFeatureMapNonContainment) firstKeyContainmentsIdx0;
@@ -94,40 +80,34 @@
// originally we had one in first key and one in second key containment
// after the key change mutation, there should be two in either one of
// them
- assertTrue((firstKeyValues.size() == 2 && secondKeyValues.size() == 0)
- || (firstKeyValues.size() == 0 && secondKeyValues.size() == 2));
+ assertTrue(firstKeyValues.size() == 2 && secondKeyValues.size() == 0
+ || firstKeyValues.size() == 0 && secondKeyValues.size() == 2);
}
@Test
public void getFeaturesOfFeatureMapGroupContainment() {
- FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
- utilForTestTypeModel);
- mutation.setTargetFeature(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapContainment_MapContainment());
- List<EStructuralFeature> featuresOfFeatureMapGroup = mutation
- .getFeaturesOfFeatureMapGroup();
+ final FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+ mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_MapContainment());
+ final List<EStructuralFeature> featuresOfFeatureMapGroup = mutation.getFeaturesOfFeatureMapGroup();
assertEquals(2, featuresOfFeatureMapGroup.size());
- assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapContainment_FirstKeyContainment()));
- assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapContainment_SecondKeyContainment()));
+ assertTrue(featuresOfFeatureMapGroup
+ .contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_FirstKeyContainment()));
+ assertTrue(featuresOfFeatureMapGroup
+ .contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_SecondKeyContainment()));
}
@Test
public void getFeaturesOfFeatureMapGroupNonContainment() {
- FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
- utilForTestTypeModel);
- mutation.setTargetFeature(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapNonContainment_Map());
- List<EStructuralFeature> featuresOfFeatureMapGroup = mutation
- .getFeaturesOfFeatureMapGroup();
+ final FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+ mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_Map());
+ final List<EStructuralFeature> featuresOfFeatureMapGroup = mutation.getFeaturesOfFeatureMapGroup();
assertEquals(2, featuresOfFeatureMapGroup.size());
- assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapNonContainment_FirstKey()));
- assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
- .getTypeWithFeatureMapNonContainment_SecondKey()));
+ assertTrue(
+ featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_FirstKey()));
+ assertTrue(
+ featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_SecondKey()));
}
}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java
index e7af942..9fb9dc4 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java
@@ -28,15 +28,15 @@
/**
* Unit tests for {@link MoveObjectMutation}.
- *
+ *
* @author Philip Langer
*/
public class MoveObjectMutationTest extends AbstractMutationTest {
@Before
public void addEAttributeToFirstEClassInEPackageWithTwoClasses() {
- EAttribute eAttributeToAdd = E_FACTORY.createEAttribute();
- EClass firstEClass = getFirstEClass();
+ final EAttribute eAttributeToAdd = E_FACTORY.createEAttribute();
+ final EClass firstEClass = getFirstEClass();
firstEClass.getEStructuralFeatures().add(eAttributeToAdd);
}
@@ -65,16 +65,13 @@
@Test
public void moveObjectForGivenSourceFeatureAndSourceContainerAndTargetFeatureAndTargetContainer()
- throws ESMutationException {
+ throws ESMutationException {
- EAttribute attributeToMove = getEAttributeInFirstClass();
+ final EAttribute attributeToMove = getEAttributeInFirstClass();
- ESMutationFactory.move(utilForEPackageWithTwoClasses)
- .setSourceObject(getFirstEClass())
- .setSourceFeature(E_PACKAGE.getEClass_EStructuralFeatures())
- .setTargetObject(getSecondEClass())
- .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
- .setEObjectToMove(attributeToMove).apply();
+ ESMutationFactory.move(utilForEPackageWithTwoClasses).setSourceObject(getFirstEClass())
+ .setSourceFeature(E_PACKAGE.getEClass_EStructuralFeatures()).setTargetObject(getSecondEClass())
+ .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures()).setEObjectToMove(attributeToMove).apply();
assertEquals(getSecondEClass(), attributeToMove.eContainer());
}
@@ -87,9 +84,10 @@
try {
applyUnconfigeredMove();
success = true;
- } catch (Exception e) {
- if (tries++ > 3)
+ } catch (final Exception e) {
+ if (tries++ > 3) {
fail();
+ }
}
}
}
@@ -105,8 +103,7 @@
public void moveObjectForGivenFeature() throws ESMutationException {
ESMutationFactory.move(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
- .apply();
+ .setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures()).apply();
assertEAttributeInFirstClassHasBeenMoved();
}
@@ -115,60 +112,52 @@
final EObject eAttributeInFirstClass = getEAttributeInFirstClass();
final EObject eAttributeInSecondClass = getEAttributeInSecondClass();
assertNull(eAttributeInFirstClass);
- assertTrue("Attribute has not been moved",
- eAttributeInSecondClass != null);
+ assertTrue("Attribute has not been moved", eAttributeInSecondClass != null);
}
@Test
public void setupForSourceGivenFeature() throws ESMutationException {
- EAttribute eAttribute = getEAttributeInFirstClass();
+ final EAttribute eAttribute = getEAttributeInFirstClass();
- ESMoveObjectMutation mutation = ESMutationFactory.move(
- utilForEPackageWithTwoClasses).setSourceFeature(
- E_PACKAGE.getEClass_EStructuralFeatures());
+ final ESMoveObjectMutation mutation = ESMutationFactory.move(utilForEPackageWithTwoClasses)
+ .setSourceFeature(E_PACKAGE.getEClass_EStructuralFeatures());
mutation.apply();
assertEquals(getFirstEClass(), mutation.getSourceObject());
assertEquals(eAttribute, mutation.getEObjectToMove());
- assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(),
- mutation.getTargetFeature());
+ assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), mutation.getTargetFeature());
assertTrue(mutation.getTargetObject() == getSecondEClass());
}
@Test
public void setupForGivenTargetContainer() throws ESMutationException {
- EAttribute eAttribute = getEAttributeInFirstClass();
+ final EAttribute eAttribute = getEAttributeInFirstClass();
- ESMoveObjectMutation mutation = ESMutationFactory.move(
- utilForEPackageWithTwoClasses).setTargetObject(
- getSecondEClass());
+ final ESMoveObjectMutation mutation = ESMutationFactory.move(utilForEPackageWithTwoClasses)
+ .setTargetObject(getSecondEClass());
mutation.apply();
assertEquals(getFirstEClass(), mutation.getSourceObject());
assertEquals(eAttribute, mutation.getEObjectToMove());
- assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(),
- mutation.getTargetFeature());
+ assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), mutation.getTargetFeature());
assertEquals(getSecondEClass(), eAttribute.eContainer());
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfNoValidObjectToMoveIsAvailable()
- throws ESMutationException {
+ public void throwsExceptionIfNoValidObjectToMoveIsAvailable() throws ESMutationException {
- ESMutationFactory.move(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
+ ESMutationFactory.move(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
fail("Should have thrown a Mutation Exception, because there is no valid setup.");
}
@Test(expected = ESMutationException.class)
- public void throwsExceptionIfNoValidTargetContainerIsAvailable()
- throws ESMutationException {
+ public void throwsExceptionIfNoValidTargetContainerIsAvailable() throws ESMutationException {
- ESMutationFactory.move(utilForEPackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+ ESMutationFactory.move(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+ .apply();
fail("Should have thrown a Mutation Exception, because there is no valid setup.");
}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java
index 569e232..3f5431f 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java
@@ -27,110 +27,86 @@
/**
* Unit tests for {@link AttributeChangeMutation}.
- *
+ *
* @author Philip Langer
*/
public class ReferenceChangeMutationTest extends AbstractMutationTest {
@Test
- public void addValueForGivenReferenceAndContainer()
- throws ESMutationException {
+ public void addValueForGivenReferenceAndContainer() throws ESMutationException {
- ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.ADD)
- .setNewReferenceValue(getFirstEClass())
- .setTargetObject(getSecondEClass())
- .setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
+ ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.ADD)
+ .setNewReferenceValue(getFirstEClass()).setTargetObject(getSecondEClass())
+ .setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
- assertTrue(getSecondEClass().getESuperTypes()
- .contains(getFirstEClass()));
+ assertTrue(getSecondEClass().getESuperTypes().contains(getFirstEClass()));
}
@Test
- public void removeValueFromGivenReferenceAndContainer()
- throws ESMutationException {
+ public void removeValueFromGivenReferenceAndContainer() throws ESMutationException {
getFirstEClass().getESuperTypes().add(getSecondEClass());
- ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.DELETE)
- .setTargetObject(getFirstEClass())
- .setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
+ ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.DELETE)
+ .setTargetObject(getFirstEClass()).setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
- assertFalse(getFirstEClass().getESuperTypes().contains(
- getSecondEClass()));
+ assertFalse(getFirstEClass().getESuperTypes().contains(getSecondEClass()));
}
@Test
- public void reorderValuesInGivenReferenceAndContainer()
- throws ESMutationException {
+ public void reorderValuesInGivenReferenceAndContainer() throws ESMutationException {
- ESReferenceChangeMutation mutation = ESMutationFactory
- .referenceChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.REORDER)
- .setTargetObject(ePackageWithTwoClasses)
- .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
+ final ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.REORDER).setTargetObject(ePackageWithTwoClasses)
+ .setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
final EObject firstEClass = getFirstEClass();
final EObject secondEClass = getSecondEClass();
mutation.apply();
- assertEquals(0,
- ePackageWithTwoClasses.getEClassifiers().indexOf(secondEClass));
- assertEquals(1,
- ePackageWithTwoClasses.getEClassifiers().indexOf(firstEClass));
+ assertEquals(0, ePackageWithTwoClasses.getEClassifiers().indexOf(secondEClass));
+ assertEquals(1, ePackageWithTwoClasses.getEClassifiers().indexOf(firstEClass));
}
@Test
- public void selectTargetContainerForGivenFeature()
- throws ESMutationException {
+ public void selectTargetContainerForGivenFeature() throws ESMutationException {
- ESReferenceChangeMutation mutation = ESMutationFactory
- .referenceChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.ADD)
- .setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
+ final ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.ADD).setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
mutation.apply();
assertEquals(E_PACKAGE.getEClass(), mutation.getTargetObject().eClass());
- assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
- mutation.getTargetObject()));
+ assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(mutation.getTargetObject()));
}
@Test
- public void selectTargetFeatureForGivenTargetContainer()
- throws ESMutationException {
+ public void selectTargetFeatureForGivenTargetContainer() throws ESMutationException {
- ESReferenceChangeMutation mutation = ESMutationFactory
- .referenceChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.ADD)
- .setTargetObject(getFirstEClass());
+ final ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.ADD).setTargetObject(getFirstEClass());
mutation.apply();
- assertEquals(E_PACKAGE.getEClass_ESuperTypes(),
- mutation.getTargetFeature());
+ assertEquals(E_PACKAGE.getEClass_ESuperTypes(), mutation.getTargetFeature());
}
@Test
public void unconfiguredAdd() throws ESMutationException {
- ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(
- utilForEPackageWithTwoClasses).setRandomChangeMode(
- ESRandomChangeMode.ADD);
+ final ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.ADD);
mutation.apply();
- assertTrue(mutation.getTargetObject() == getFirstEClass()
- || mutation.getTargetObject() == getSecondEClass());
- assertEquals(E_PACKAGE.getEClass_ESuperTypes(),
- mutation.getTargetFeature());
+ assertTrue(mutation.getTargetObject() == getFirstEClass() || mutation.getTargetObject() == getSecondEClass());
+ assertEquals(E_PACKAGE.getEClass_ESuperTypes(), mutation.getTargetFeature());
}
@Test(expected = ESMutationException.class)
public void unconfiguredDelete() throws ESMutationException {
- ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
- .setRandomChangeMode(ESRandomChangeMode.DELETE).apply();
+ ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.DELETE)
+ .apply();
fail("Should have thrown an exception since there is no object to delete from cross-reference");
}
@@ -139,15 +115,13 @@
public void unconfiguredDelete_2() throws ESMutationException {
getFirstEClass().getESuperTypes().add(getSecondEClass());
- ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(
- utilForEPackageWithTwoClasses).setRandomChangeMode(
- ESRandomChangeMode.DELETE);
+ final ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+ .setRandomChangeMode(ESRandomChangeMode.DELETE);
mutation.apply();
assertEquals(getFirstEClass(), mutation.getTargetObject());
- assertEquals(E_PACKAGE.getEClass_ESuperTypes(),
- mutation.getTargetFeature());
+ assertEquals(E_PACKAGE.getEClass_ESuperTypes(), mutation.getTargetFeature());
}
private EClass getFirstEClass() {
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.core.resources.prefs
rename to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.resources.prefs
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.core.runtime.prefs
copy to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.runtime.prefs
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs
index 44217f8..edbd6f6 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=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=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.launching.prefs
copy to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.launching.prefs
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.ui.prefs
similarity index 94%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs
copy to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.ltk.core.refactoring.prefs
similarity index 100%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.ltk.core.refactoring.prefs
copy to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.m2e.core.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.api.tools.prefs
copy to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.prefs
similarity index 100%
copy from bundles/org.eclipse.emf.emfstore.ecore/.settings/org.eclipse.pde.prefs
copy to tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.prefs
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
index 13a5a6c..7ad22e5 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.performance.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Performance Tests
Bundle-SymbolicName: org.eclipse.emf.emfstore.performance.test
-Bundle-Version: 1.8.1.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.emfstore.modelmutator,
org.eclipse.emf.emfstore.server,
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/pom.xml b/tests/org.eclipse.emf.emfstore.performance.test/pom.xml
index addf810..4cdb2bd 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.performance.test/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.performance.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/Calculate.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/Calculate.java
index a416dac..d670136 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/Calculate.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/Calculate.java
@@ -6,7 +6,7 @@
public static double max(double[] arr) {
double max = Double.MIN_VALUE;
- for (double x : arr) {
+ for (final double x : arr) {
if (x > max) {
max = x;
}
@@ -16,7 +16,7 @@
public static double average(double[] arr) {
double sum = 0.0;
- for (double x : arr) {
+ for (final double x : arr) {
sum += x;
}
return (int) (sum / arr.length * 1000.0) / 1000.0;
@@ -24,13 +24,13 @@
public static double mean(double[] arr) {
Arrays.sort(arr);
- int ind = arr.length / 2 - 1 + arr.length % 2;
+ final int ind = arr.length / 2 - 1 + arr.length % 2;
return arr[ind];
}
public static double min(double[] arr) {
double min = Double.MAX_VALUE;
- for (double x : arr) {
+ for (final double x : arr) {
if (x < min) {
min = x;
}
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java
index f86a998..e650f89 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java
@@ -20,15 +20,15 @@
try {
while (!stop) {
if (active) {
- long usedMemory = Runtime.getRuntime().totalMemory()
- - Runtime.getRuntime().freeMemory();
+ final long usedMemory = Runtime.getRuntime().totalMemory()
+ - Runtime.getRuntime().freeMemory();
if (usedMemory > maxUsedMemory) {
maxUsedMemory = usedMemory;
}
}
Thread.sleep(MEASUREMENT_PERIOD);
}
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
}
}
@@ -39,8 +39,8 @@
public long stopMeasurements() {
active = false;
- long usedMemory = Runtime.getRuntime().totalMemory()
- - Runtime.getRuntime().freeMemory();
+ final long usedMemory = Runtime.getRuntime().totalMemory()
+ - Runtime.getRuntime().freeMemory();
long curMaxMemory = maxUsedMemory;
if (usedMemory > curMaxMemory) {
curMaxMemory = usedMemory;
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
index 55b93e9..d88a768 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
@@ -37,11 +37,10 @@
/**
* This TestCase tests all methods in the main {@link org.unicase.emfstore.EmfStore} interface.
- *
+ *
* @author Dmitry Litvinov
*/
public class PerformanceTest extends ESTestWithLoggedInUserMock {
-
private static final int PROJECTSIZE = 10000;
private static final int NR_OF_CHANGES = 100;
@@ -71,7 +70,7 @@
/**
* Start server and gain session id.
- *
+ *
* @throws ESException in case of failure
* @throws IOException
*/
@@ -91,7 +90,7 @@
/**
* Opens projects of different sizes, shares them with the server and then deletes them. r
- *
+ *
* @see org.unicase.emfstore.EmfStore#createProject(org.eclipse.emf.emfstore.server.model.SessionId, String, String,
* org.eclipse.emf.emfstore.server.model.versioning.LogMessage, Project)
* @see org.unicase.emfstore.EmfStore#getProjectList(org.eclipse.emf.emfstore.server.model.SessionId)
@@ -106,10 +105,10 @@
for (int i = 0; i < NUM_ITERATIONS; i++) {
memoryMeter.startMeasurements();
memBefore[i] = usedMemory();
- long time = System.currentTimeMillis();
-
+ final long time = System.currentTimeMillis();
+
ProjectUtil.share(getUsersession(), getLocalProject());
-
+
times[i] = (System.currentTimeMillis() - time) / 1000.0;
memAfter[i] = usedMemory();
@@ -134,7 +133,7 @@
/**
* Measures average time, spent for the checkout operation. Opens projects of different sizes, shares them with the
* server, checkouts and then deletes them.
- *
+ *
* @see org.unicase.emfstore.EmfStore#createProject(org.eclipse.emf.emfstore.server.model.SessionId, String, String,
* org.eclipse.emf.emfstore.server.model.versioning.LogMessage, Project)
* @see org.unicase.emfstore.EmfStore#getProjectList(org.eclipse.emf.emfstore.server.model.SessionId)
@@ -144,12 +143,12 @@
public void testCheckoutProject() throws ESException {
ProjectUtil.share(getUsersession(), getLocalProject());
-
+
long memAfterThreshold = 0;
for (int i = 0; i < NUM_ITERATIONS; i++) {
memoryMeter.startMeasurements();
memBefore[i] = usedMemory();
- long time = System.currentTimeMillis();
+ final long time = System.currentTimeMillis();
ProjectUtil.checkout(getLocalProject());
times[i] = (System.currentTimeMillis() - time) / 1000.0;
@@ -173,7 +172,7 @@
* with the server and checks it out as two different projects. Then the test generates changes in one of the
* projects, using the ModelMutator, commits them to the server, and updates the second project. The test performs
* model change, commit and update NUM_ITERATIONS times and calculates times for commit and update operations
- *
+ *
* @see org.unicase.emfstore.EmfStore#createProject(org.eclipse.emf.emfstore.server.model.SessionId, String, String,
* org.eclipse.emf.emfstore.server.model.versioning.LogMessage, Project)
* @see org.unicase.emfstore.EmfStore#getProjectList(org.eclipse.emf.emfstore.server.model.SessionId)
@@ -183,19 +182,19 @@
public void testCommitAndUpdateProject() throws ESException {
getLocalProject().shareProject(nullMonitor());
-
+
final ESLocalProject checkout = ProjectUtil.checkout(getLocalProject());
-
- double[] modelChangeTimes = new double[NUM_ITERATIONS];
- double[] commitTimes = new double[NUM_ITERATIONS];
- double[] updateTimes = new double[NUM_ITERATIONS];
- long[] memBeforeMut = new long[NUM_ITERATIONS];
- long[] memDuringMut = new long[NUM_ITERATIONS];
- long[] memAfterMut = new long[NUM_ITERATIONS];
- long[] memDuringCommit = new long[NUM_ITERATIONS];
- long[] memAfterCommit = new long[NUM_ITERATIONS];
- long[] memDuringUpdate = new long[NUM_ITERATIONS];
- long[] memAfterUpdate = new long[NUM_ITERATIONS];
+
+ final double[] modelChangeTimes = new double[NUM_ITERATIONS];
+ final double[] commitTimes = new double[NUM_ITERATIONS];
+ final double[] updateTimes = new double[NUM_ITERATIONS];
+ final long[] memBeforeMut = new long[NUM_ITERATIONS];
+ final long[] memDuringMut = new long[NUM_ITERATIONS];
+ final long[] memAfterMut = new long[NUM_ITERATIONS];
+ final long[] memDuringCommit = new long[NUM_ITERATIONS];
+ final long[] memAfterCommit = new long[NUM_ITERATIONS];
+ final long[] memDuringUpdate = new long[NUM_ITERATIONS];
+ final long[] memAfterUpdate = new long[NUM_ITERATIONS];
for (int i = 0; i < NUM_ITERATIONS; i++) {
memoryMeter.startMeasurements();
@@ -209,7 +208,8 @@
memAfterMut[i] = usedMemory();
ModelUtil.logInfo("change model- iteration #" + (i + 1) + ": time=" + modelChangeTimes[i]
+ " memory used before:" + memBeforeMut[i] / 1024 / 1024 + "MB, during: " + memDuringMut[i] / 1024
- / 1024 + "MB, after: " + memAfterMut[i] / 1024 / 1024 + "MB");
+ / 1024
+ + "MB, after: " + memAfterMut[i] / 1024 / 1024 + "MB");
System.out.println("VERSION BEFORE commit:" + getLocalProject().getBaseVersion().getIdentifier());
time = System.currentTimeMillis();
@@ -223,7 +223,8 @@
memAfterCommit[i] = usedMemory();
ModelUtil.logInfo("commit project - iteration #" + (i + 1) + ": time=" + commitTimes[i]
+ ", memory used before: " + memAfterMut[i] / 1024 / 1024 + "MB, during: " + memDuringCommit[i] / 1024
- / 1024 + "MB, after: " + memAfterCommit[i] / 1024 / 1024 + "MB");
+ / 1024
+ + "MB, after: " + memAfterCommit[i] / 1024 / 1024 + "MB");
if (i > 0 && memAfter[i] > memAfterThreshold * ACCEPTED_VARIANCE) {
fail();
}
@@ -242,7 +243,8 @@
memAfterUpdate[i] = usedMemory();
ModelUtil.logInfo("update project - iteration #" + (i + 1) + ": time=" + updateTimes[i]
+ ", memory used before: " + memAfterCommit[i] / 1024 / 1024 + "MB, during: " + memDuringUpdate[i]
- / 1024 / 1024 + "MB, after: " + memAfterUpdate[i] / 1024 / 1024 + "MB");
+ / 1024 / 1024
+ + "MB, after: " + memAfterUpdate[i] / 1024 / 1024 + "MB");
if (i > 0 && memAfter[i] > memAfterThreshold * ACCEPTED_VARIANCE) {
fail();
@@ -270,53 +272,53 @@
Runtime.getRuntime().gc();
return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
}
-
+
private static IProgressMonitor nullMonitor() {
return new NullProgressMonitor();
}
-
+
public void generateModels(final ProjectSpace projectSpace, int numberOfModleElements) {
lastSeed = lastSeed == seed ? seed + 1 : seed;
final ESModelMutatorConfiguration mmc = new ESModelMutatorConfiguration(
- ESModelMutatorUtil.getEPackage(MODEL_KEY),
- projectSpace.getProject(), lastSeed);
-
+ ESModelMutatorUtil.getEPackage(MODEL_KEY),
+ projectSpace.getProject(), lastSeed);
+
mmc.setMaxDeleteCount(1);
mmc.setUseEcoreUtilDelete(false);
mmc.setMinObjectsCount(numberOfModleElements);
mmc.setEditingDomain(ESWorkspaceProviderImpl.getInstance().getInternalWorkspace().getEditingDomain());
- Collection<EStructuralFeature> features = new ArrayList<EStructuralFeature>();
+ final Collection<EStructuralFeature> features = new ArrayList<EStructuralFeature>();
features.add(org.eclipse.emf.emfstore.internal.common.model.ModelPackage.eINSTANCE.getProject_CutElements());
mmc.seteStructuralFeaturesToIgnore(features);
-
+
RunESCommand.run(new ESVoidCallable() {
@Override
public void run() {
ESDefaultModelMutator.generateModel(mmc);
}
});
-
-// System.out.println("Number of changes: " + projectSpace.getOperations().size());
+
+ // System.out.println("Number of changes: " + projectSpace.getOperations().size());
}
public void changeModel(final ProjectSpace prjSpace, final int nrOfChanges) {
lastSeed = lastSeed == seed ? seed + 1 : seed;
final ESModelMutatorConfiguration mmc = new ESModelMutatorConfiguration(
- ESModelMutatorUtil.getEPackage(MODEL_KEY),
- prjSpace.getProject(), lastSeed);
+ ESModelMutatorUtil.getEPackage(MODEL_KEY),
+ prjSpace.getProject(), lastSeed);
mmc.setMaxDeleteCount(1);
mmc.setUseEcoreUtilDelete(false);
mmc.setMinObjectsCount(1);
mmc.setEditingDomain(ESWorkspaceProviderImpl.getInstance().getInternalWorkspace().getEditingDomain());
- Collection<EStructuralFeature> features = new ArrayList<EStructuralFeature>();
+ final Collection<EStructuralFeature> features = new ArrayList<EStructuralFeature>();
features.add(org.eclipse.emf.emfstore.internal.common.model.ModelPackage.eINSTANCE.getProject_CutElements());
mmc.seteStructuralFeaturesToIgnore(features);
- List<EPackage> packages = new ArrayList<EPackage>();
+ final List<EPackage> packages = new ArrayList<EPackage>();
packages.add(BowlingPackage.eINSTANCE);
mmc.setModelPackages(packages);
-
- long time = System.currentTimeMillis();
- RunESCommand.run(new ESVoidCallable() {
+
+ final long time = System.currentTimeMillis();
+ RunESCommand.run(new ESVoidCallable() {
@Override
public void run() {
mmc.setMinObjectsCount(nrOfChanges);
@@ -324,6 +326,6 @@
}
});
System.out.println("Changed model: " + (System.currentTimeMillis() - time) / 1000.0 + "sec");
-// System.out.println("Number of changes: " + prjSpace.getOperations().size());
+ // System.out.println("Number of changes: " + prjSpace.getOperations().size());
}
}
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
index 2bd398c..3ff7e7c 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* TobiasVerhoeven
******************************************************************************/
@@ -46,7 +46,7 @@
/**
* Tests for creating big amounts of data in order to test memory management.
- *
+ *
* @author Tobias Verhoeven
*/
@SuppressWarnings("restriction")
@@ -58,7 +58,7 @@
// be kept
private static final Logger LOGGER = Logger
- .getLogger("org.eclipse.emf.emfstore.client.test");
+ .getLogger("org.eclipse.emf.emfstore.client.test");
private long currentProjectCount; // The current project count.
private ESModelMutatorConfiguration currentProjectConfiguration;
private static final ESSystemOutProgressMonitor MONITOR = new ESSystemOutProgressMonitor();
@@ -70,11 +70,11 @@
/** Rule for deleting all remote projects. */
@Rule
public NoRemoteProjectRule noRemoteProjectRule = new NoRemoteProjectRule(
- runningEMFStoreRule);
+ runningEMFStoreRule);
/**
* Starts the EMFstore.
- *
+ *
* @throws IOException
* Signals that an I/O exception has occurred.
* @throws FatalESException
@@ -84,7 +84,7 @@
*/
@BeforeClass
public static void before() throws IOException, FatalESException,
- ESException {
+ ESException {
runningEMFStoreRule.before();
}
@@ -98,7 +98,7 @@
/**
* Test for solely sharing projects.
- *
+ *
* @throws ESException
* in case of an error
*/
@@ -110,24 +110,24 @@
}
private void shareProjectsLoadTest(int minProjectSize, int projectCount)
- throws ESException {
+ throws ESException {
for (int i = 0; i < projectCount; i++) {
final ESLocalProject project = generateRandomProject(minProjectSize);
long time = System.nanoTime();
project.shareProject(runningEMFStoreRule.defaultSession(), null);
time = System.nanoTime() - time;
log("Shared Project: " + project.getProjectName() + " ,Memory: "
- + usedMemoryInMib() + " MiB");
+ + usedMemoryInMib() + " MiB");
deleteLocallyIfNeeded(project);
log("Shared Project: " + project.getProjectName() + " ,Memory: "
- + usedMemoryInMib() + " MiB");
+ + usedMemoryInMib() + " MiB");
}
}
/**
* Test for sharing and checking out projects.
- *
+ *
* @throws ESException
* in case of an error
*/
@@ -138,7 +138,7 @@
}
private void shareCheckoutProjectsLoadTest(int minProjectSize,
- int projectCount) throws ESException {
+ int projectCount) throws ESException {
final long start = currentProjectCount;
final int[] sizes = new int[projectCount];
@@ -150,22 +150,22 @@
sizes[i] = project.getAllModelElements().size();
log("Shared Project: " + project.getProjectName() + " ,Memory: "
- + usedMemoryInMib() + " MiB");
+ + usedMemoryInMib() + " MiB");
}
int i = 0;
for (final ESRemoteProject remoteProject : runningEMFStoreRule.server()
- .getRemoteProjects(runningEMFStoreRule.defaultSession())) {
+ .getRemoteProjects(runningEMFStoreRule.defaultSession())) {
final ESLocalProject project = remoteProject.checkout(
- "Generated project_" + (start + i), MONITOR);
+ "Generated project_" + (start + i), MONITOR);
assertEquals("Generated project_" + (start + i),
- project.getProjectName());
+ project.getProjectName());
// Assert.assertEquals(sizes[i],
// project.getAllModelElements().size());
deleteLocallyIfNeeded(project);
log("Checked out Project: " + project.getProjectName() + "Memory: "
- + usedMemoryInMib() + " MiB");
+ + usedMemoryInMib() + " MiB");
i++;
}
@@ -173,7 +173,7 @@
/**
* Test for committing changes.
- *
+ *
* @throws ESException
* in case of an error
*/
@@ -184,7 +184,7 @@
}
private void commitLoadTest(int minProjectSize, int projectCount,
- int historySize, int minChangeSize) throws ESException {
+ int historySize, int minChangeSize) throws ESException {
for (int i = 0; i < projectCount; i++) {
final ESLocalProject project = generateRandomProject(minProjectSize);
@@ -195,8 +195,8 @@
commitProject(project);
log("Committed Change: " + z + " of Project "
- + project.getProjectName() + " ,Memory: "
- + usedMemoryInMib() + " MiB");
+ + project.getProjectName() + " ,Memory: "
+ + usedMemoryInMib() + " MiB");
}
deleteLocallyIfNeeded(project);
}
@@ -204,7 +204,7 @@
/**
* Test for committing changes and checking out resulting projectstates.
- *
+ *
* @throws ESException
* in case of an error
*/
@@ -216,8 +216,8 @@
}
private void commitCheckoutLoadTest(int minProjectSize, int projectCount,
- int historySize, int minChangeSize, int checkoutStep)
- throws ESException {
+ int historySize, int minChangeSize, int checkoutStep)
+ throws ESException {
for (int i = 0; i < projectCount; i++) {
@@ -230,8 +230,8 @@
mutateProject(project, minChangeSize);
versions.add(commitProject(project));
log("Committed Change: " + z + " of Project "
- + project.getProjectName() + " ,Memory: "
- + usedMemoryInMib() + " MiB");
+ + project.getProjectName() + " ,Memory: "
+ + usedMemoryInMib() + " MiB");
}
deleteLocallyIfNeeded(project);
@@ -240,12 +240,12 @@
log("Checking out version: " + versions.get(x).getIdentifier());
final ESLocalProject projectCopy = project.getRemoteProject()
- .checkout(project.getProjectName() + "_Copy" + x,
- runningEMFStoreRule.defaultSession(),
- versions.get(x), MONITOR);
+ .checkout(project.getProjectName() + "_Copy" + x,
+ runningEMFStoreRule.defaultSession(),
+ versions.get(x), MONITOR);
log("Checked out version: " + versions.get(x).getIdentifier()
- + " ,Memory: " + usedMemoryInMib() + " MiB");
+ + " ,Memory: " + usedMemoryInMib() + " MiB");
deleteLocallyIfNeeded(projectCopy);
}
}
@@ -253,7 +253,7 @@
/**
* Shares projects, commits changes and updates local versions.
- *
+ *
* @throws ESException
* in case of an error
*/
@@ -263,7 +263,7 @@
}
private void updateLoadTest(int minProjectSize, int projectCount,
- int historySize, int minChangeSize) throws ESException {
+ int historySize, int minChangeSize) throws ESException {
for (int i = 0; i < projectCount; i++) {
@@ -271,10 +271,10 @@
project.shareProject(runningEMFStoreRule.defaultSession(), null);
final ESLocalProject projectSecondCheckout = project
- .getRemoteProject().checkout(
- project.getProjectName() + "_SecondCheckout_" + i,
- runningEMFStoreRule.defaultSession(),
- project.getBaseVersion(), null);
+ .getRemoteProject().checkout(
+ project.getProjectName() + "_SecondCheckout_" + i,
+ runningEMFStoreRule.defaultSession(),
+ project.getBaseVersion(), null);
final List<ESVersionSpec> versions = new ArrayList<ESVersionSpec>();
@@ -287,7 +287,7 @@
deleteLocallyIfNeeded(project);
projectSecondCheckout.update(
- versions.get((versions.size() - 1) / 2), null, null);
+ versions.get((versions.size() - 1) / 2), null, null);
projectSecondCheckout.update(versions.get(1), null, null);
projectSecondCheckout.update(null);
deleteLocallyIfNeeded(projectSecondCheckout);
@@ -299,7 +299,7 @@
/**
* Shares projects, commits changes and retrieves specific changePackages.
- *
+ *
* @throws ESException
* in case of an error
*/
@@ -309,7 +309,7 @@
}
private void commitGetChangesLoadTest(int minProjectSize, int projectCount,
- int historySize, int minChangeSize) throws ESException {
+ int historySize, int minChangeSize) throws ESException {
for (int i = 0; i < projectCount; i++) {
@@ -321,11 +321,11 @@
for (int z = 0; z < historySize; z++) {
mutateProject(project, minChangeSize);
versions.add(((ESPrimaryVersionSpecImpl) commitProject(project))
- .toInternalAPI());
+ .toInternalAPI());
}
((ESLocalProjectImpl) project).toInternalAPI().getChanges(
- versions.get(0), versions.get(versions.size() - 1));
+ versions.get(0), versions.get(versions.size() - 1));
deleteLocallyIfNeeded(project);
log("Memory: " + usedMemoryInMib() + " MiB");
@@ -335,16 +335,16 @@
private long usedMemoryInMib() {
return Runtime.getRuntime().totalMemory()
- - Runtime.getRuntime().freeMemory() >> 20;
+ - Runtime.getRuntime().freeMemory() >> 20;
}
private ESLocalProject generateRandomProject(int minProjectSize) {
final String projectName = "Generated project_" + currentProjectCount;
final Project project = org.eclipse.emf.emfstore.internal.common.model.ModelFactory.eINSTANCE
- .createProject();
+ .createProject();
final ESModelMutatorConfiguration config = createModelMutatorConfigurationRandom(
- modelKey, project, minProjectSize, seed);
+ modelKey, project, minProjectSize, seed);
new EMFStoreCommand() {
@Override
@@ -354,7 +354,7 @@
}.run(false);
final ProjectSpace projectSpace = ((ESWorkspaceImpl) runningEMFStoreRule
- .connectedWorkspace()).toInternalAPI().importProject(project,
+ .connectedWorkspace()).toInternalAPI().importProject(project,
projectName, "");
currentProjectCount++;
@@ -364,12 +364,13 @@
private void mutateProject(final ESLocalProject project, int minChangeSize) {
if (currentProjectConfiguration == null
- || currentProjectConfiguration.getRootEObject() != ((ESLocalProjectImpl) project)
- .toInternalAPI().getProject()) {
+ || currentProjectConfiguration.getRootEObject() != ((ESLocalProjectImpl) project)
+ .toInternalAPI().getProject()) {
currentProjectConfiguration = createModelMutatorConfigurationRandom(
- modelKey, ((ESLocalProjectImpl) project).toInternalAPI()
- .getProject(), minChangeSize, seed);
+ modelKey, ((ESLocalProjectImpl) project).toInternalAPI()
+ .getProject(),
+ minChangeSize, seed);
}
currentProjectConfiguration.setMinObjectsCount(minChangeSize);
@@ -381,16 +382,16 @@
final long time = System.currentTimeMillis();
ESDefaultModelMutator.changeModel(mmc);
System.out.println("Changed model: "
- + (System.currentTimeMillis() - time) / 1000.0 + "sec");
+ + (System.currentTimeMillis() - time) / 1000.0 + "sec");
}
}.run(false);
}
private ESModelMutatorConfiguration createModelMutatorConfigurationRandom(
- String modelKey, EObject rootObject, int minObjectsCount, long seed) {
+ String modelKey, EObject rootObject, int minObjectsCount, long seed) {
final ESModelMutatorConfiguration config = new ESModelMutatorConfiguration(
- ESModelMutatorUtil.getEPackage(modelKey), rootObject, seed);
+ ESModelMutatorUtil.getEPackage(modelKey), rootObject, seed);
config.setIgnoreAndLog(false);
config.setMinObjectsCount(minObjectsCount);
@@ -398,7 +399,7 @@
final List<EStructuralFeature> eStructuralFeaturesToIgnore = new ArrayList<EStructuralFeature>();
config.setEditingDomain(((ESWorkspaceImpl) runningEMFStoreRule
- .connectedWorkspace()).toInternalAPI().getEditingDomain());
+ .connectedWorkspace()).toInternalAPI().getEditingDomain());
config.seteStructuralFeaturesToIgnore(eStructuralFeaturesToIgnore);
return config;
}
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java
index 3c47b4c..07f552c 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.performance.test.memory;
@@ -25,11 +25,11 @@
@SuppressWarnings("restriction")
public class NoRemoteProjectRule extends ExternalResource {
- private RunningEMFStoreRule rule;
+ private final RunningEMFStoreRule rule;
/**
* Instantiates a new no remote project rule.
- *
+ *
* @param rule
* the EMFStore rule
*/
@@ -46,18 +46,18 @@
protected void after() {
try {
deleteRemoteProjects();
- } catch (IOException e) {
+ } catch (final IOException e) {
ModelUtil.logException(e);
- } catch (FatalESException e) {
+ } catch (final FatalESException e) {
ModelUtil.logException(e);
- } catch (ESException e) {
+ } catch (final ESException e) {
ModelUtil.logException(e);
}
}
private void deleteRemoteProjects() throws IOException, FatalESException,
- ESException {
- for (ESRemoteProject project : rule.server().getRemoteProjects()) {
+ ESException {
+ for (final ESRemoteProject project : rule.server().getRemoteProjects()) {
project.delete(rule.defaultSession(), new NullProgressMonitor());
}
}
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java
index 21b1f58..a5089e2 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.performance.test.memory;
@@ -40,7 +40,7 @@
/**
* Server.
- *
+ *
* @return the Server
*/
public ESServer server() {
@@ -49,7 +49,7 @@
/**
* Default session.
- *
+ *
* @return the user-session.
*/
public ESUsersession defaultSession() {
@@ -58,7 +58,7 @@
/**
* Connected workspace.
- *
+ *
* @return the connected workspace.
*/
public ESWorkspace connectedWorkspace() {
@@ -67,7 +67,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.junit.rules.ExternalResource#before()
*/
@Override
@@ -78,29 +78,29 @@
workspace = ESWorkspaceProvider.INSTANCE.getWorkspace();
server = ESServer.FACTORY.createServer("RunningEMFStoreRuleStore",
- "localhost", 8080, KeyStoreManager.DEFAULT_CERTIFICATE);
+ "localhost", 8080, KeyStoreManager.DEFAULT_CERTIFICATE);
server = workspace.addServer(server);
startEMFStore();
session = server.login("super", "super");
((ESWorkspaceImpl) workspace).toInternalAPI().getUsersessions()
- .add(((ESUsersessionImpl) session).toInternalAPI());
+ .add(((ESUsersessionImpl) session).toInternalAPI());
}
/**
* {@inheritDoc}
- *
+ *
* @see org.junit.rules.ExternalResource#after()
*/
@Override
protected void after() {
stopEMFStore();
((ESWorkspaceImpl) workspace).toInternalAPI().getUsersessions()
- .remove(((ESUsersessionImpl) session).toInternalAPI());
+ .remove(((ESUsersessionImpl) session).toInternalAPI());
if (server.getName().equals("RunningEMFStoreRuleStore")) {
try {
workspace.removeServer(server);
- } catch (ESServerNotFoundException e) {
+ } catch (final ESServerNotFoundException e) {
// ignore
}
}
@@ -109,13 +109,13 @@
private static void startEMFStore() {
try {
EMFStoreController.runAsNewThread();
- } catch (FatalESException e) {
+ } catch (final FatalESException e) {
System.out.println(e.toString());
}
}
private static void stopEMFStore() {
- EMFStoreController server = EMFStoreController.getInstance();
+ final EMFStoreController server = EMFStoreController.getInstance();
if (server != null) {
server.stop();
}
@@ -123,7 +123,7 @@
// give the server some time to unbind from it's ips. Not the nicest
// solution ...
Thread.sleep(2000);
- } catch (InterruptedException e) {
+ } catch (final InterruptedException e) {
System.out.println(e.toString());
}
diff --git a/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.server.test/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.server.test/AllServerTests.launch b/tests/org.eclipse.emf.emfstore.server.test/AllServerTests.launch
index 646d6ff..f69bc97 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/AllServerTests.launch
+++ b/tests/org.eclipse.emf.emfstore.server.test/AllServerTests.launch
@@ -3,7 +3,7 @@
<booleanAttribute key="append.args" value="true"/>
<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticAdd" value="false"/>
<booleanAttribute key="automaticValidate" value="false"/>
<stringAttribute key="bootstrap" value=""/>
<stringAttribute key="checked" value="[NONE]"/>
@@ -12,8 +12,7 @@
<booleanAttribute key="clearwslog" value="false"/>
<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
<booleanAttribute key="default" value="false"/>
-<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.emf.emfstore.branding,org.eclipse.emf.emfstore.client.example.test,org.eclipse.emf.emfstore.client.test.alltests,org.eclipse.emf.emfstore.client.test.ui,org.eclipse.emf.emfstore.client.transaction,org.eclipse.emf.emfstore.client.ui.transaction,org.eclipse.emf.emfstore.ecore,org.eclipse.emf.emfstore.example.helloworld,org.eclipse.emf.emfstore.example.installer,org.eclipse.emf.emfstore.example.merging,org.eclipse.emf.emfstore.example.sessionprovider,org.eclipse.emf.emfstore.examplemodel.edit,org.eclipse.emf.emfstore.fuzzy.emf.edit,org.eclipse.emf.emfstore.fuzzy.emf.editor,org.eclipse.emf.emfstore.fuzzy.emf.example,org.eclipse.emf.emfstore.mongodb,org.eclipse.emf.emfstore.mongodb.client,org.eclipse.emf.emfstore.mongodb.server"/>
-<booleanAttribute key="includeOptional" value="true"/>
+<booleanAttribute key="includeOptional" value="false"/>
<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerTests.java"/>
@@ -34,8 +33,8 @@
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="product" value="org.eclipse.platform.ide"/>
<booleanAttribute key="run_in_ui_thread" value="false"/>
-<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation*1.0.0.v20101115-0725@default:default,javax.annotation*1.2.0.v201401042248@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare*3.1.1.201408191310@default:default,org.eclipse.emf.compare*3.1.2.201501201328@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecp.edit@default:default,org.eclipse.emf.ecp.ui.view@default:default,org.eclipse.emf.ecp.view.context@default:default,org.eclipse.emf.ecp.view.model.provider.xmi@default:default,org.eclipse.emf.ecp.view.model@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi*3.8.0.v20120529-1548@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="com.eclipsesource.makeithappen.model.edit@default:default,com.eclipsesource.makeithappen.model@default:default,org.eclipse.emf.ecp.makeithappen.model.edit@default:default,org.eclipse.emf.ecp.makeithappen.model.viewmodel@default:default,org.eclipse.emf.ecp.makeithappen.model@default:default,org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client.test@default:default,org.eclipse.emf.emfstore.client.ui.historybrowsercomparator@default:default,org.eclipse.emf.emfstore.client.ui.rap@default:false,org.eclipse.emf.emfstore.client.ui.rcp@default:false,org.eclipse.emf.emfstore.client.ui.test@default:false,org.eclipse.emf.emfstore.client.ui@default:default,org.eclipse.emf.emfstore.client.ws.test@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.fuzzy.emf.diff.test@default:default,org.eclipse.emf.emfstore.fuzzy.emf.test@default:default,org.eclipse.emf.emfstore.fuzzy.emf@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator.test@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.performance.test@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.google.guava@default:default,com.ibm.icu@default:default,javax.inject@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.jxpath@default:default,org.apache.commons.logging@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.linux.x86_64@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.annotations@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.emf.xpath@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.swt.gtk@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.region@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface@default:default,org.eclipse.osgi*3.11.0.v20160603-1336@-1:true,org.eclipse.osgi.compatibility.state@default:default,org.eclipse.osgi.services*3.5.100.v20160504-1419@default:default,org.eclipse.swt.gtk.linux.x86_64@default:default,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core@default:default,org.hamcrest.library@default:default,org.junit@default:default,org.w3c.css.sac@default:default,org.w3c.dom.events@default:default,org.w3c.dom.smil*1.0.1.v200903091627@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
<booleanAttribute key="show_selected_only" value="false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
diff --git a/tests/org.eclipse.emf.emfstore.server.test/ChecksumStreamingTest.launch b/tests/org.eclipse.emf.emfstore.server.test/ChecksumStreamingTest.launch
new file mode 100644
index 0000000..3bd9af8
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.server.test/ChecksumStreamingTest.launch
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="append.args" value="true"/>
+<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
+<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="false"/>
+<stringAttribute key="deselected_workspace_plugins" value="org.eclipse.emf.emfstore.client.transaction,org.eclipse.emf.emfstore.client.ui.transaction,org.eclipse.emf.emfstore.mongodb,org.eclipse.emf.emfstore.mongodb.client,org.eclipse.emf.emfstore.mongodb.server"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/ChecksumStreamingTest.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<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.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.emfstore.server.test.ChecksumStreamingTest"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.emfstore.server.test"/>
+<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.emf.cdo.server.product.tcp_h2"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava@default:default,com.ibm.icu@default:default,javax.annotation*1.2.0.v201401042248@default:default,javax.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec*1.6.0.v201305230611@default:default,org.eclipse.ant.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.emf.cdo.ecore.retrofit@default:false,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.edit*4.0.0.201501201328@default:default,org.eclipse.emf.compare.ide.ui@default:default,org.eclipse.emf.compare.ide@default:default,org.eclipse.emf.compare.rcp.ui@default:default,org.eclipse.emf.compare.rcp@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.transaction@default:default,org.eclipse.emf.validation@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.help@default:default,org.eclipse.jdt.junit.runtime*3.4.500.v20140527-1138@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.osgi*3.8.2.v20130124-134944@-1:true,org.eclipse.osgi.services@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.swtbot.eclipse.core@default:default,org.eclipse.swtbot.eclipse.finder@default:default,org.eclipse.swtbot.forms.finder@default:default,org.eclipse.swtbot.junit4_x@default:default,org.eclipse.swtbot.swt.finder@default:default,org.eclipse.team.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.hamcrest.core*1.3.0.v201303031735@default:default,org.hamcrest.library@default:default,org.junit*4.11.0.v201303080030@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.slf4j.log4j@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="de.metus.model@default:default,org.eclipse.emf.emfstore.branding@default:default,org.eclipse.emf.emfstore.client.api.test@default:false,org.eclipse.emf.emfstore.client.changetracking.test@default:false,org.eclipse.emf.emfstore.client.conflictdetection.test@default:false,org.eclipse.emf.emfstore.client.example.test@default:default,org.eclipse.emf.emfstore.client.model.edit@default:default,org.eclipse.emf.emfstore.client.recording.test@default:false,org.eclipse.emf.emfstore.client.test.alltests@default:default,org.eclipse.emf.emfstore.client.test.ui@default:default,org.eclipse.emf.emfstore.client.test@default:default,org.eclipse.emf.emfstore.client.ui.historybrowsercomparator@default:default,org.eclipse.emf.emfstore.client.ui.rap@default:false,org.eclipse.emf.emfstore.client.ui.rcp@default:false,org.eclipse.emf.emfstore.client.ui.test@default:false,org.eclipse.emf.emfstore.client.ui@default:default,org.eclipse.emf.emfstore.client@default:default,org.eclipse.emf.emfstore.common.model.edit@default:default,org.eclipse.emf.emfstore.common.model@default:default,org.eclipse.emf.emfstore.common@default:default,org.eclipse.emf.emfstore.ecore@default:default,org.eclipse.emf.emfstore.example.helloworld@default:default,org.eclipse.emf.emfstore.example.installer@default:default,org.eclipse.emf.emfstore.example.merging@default:default,org.eclipse.emf.emfstore.example.sessionprovider@default:default,org.eclipse.emf.emfstore.examplemodel.edit@default:default,org.eclipse.emf.emfstore.examplemodel@default:default,org.eclipse.emf.emfstore.fuzzy.emf.diff.test@default:default,org.eclipse.emf.emfstore.fuzzy.emf.edit@default:default,org.eclipse.emf.emfstore.fuzzy.emf.editor@default:default,org.eclipse.emf.emfstore.fuzzy.emf.example@default:default,org.eclipse.emf.emfstore.fuzzy.emf.test@default:default,org.eclipse.emf.emfstore.fuzzy.emf@default:default,org.eclipse.emf.emfstore.migration@default:default,org.eclipse.emf.emfstore.modelmutator.test@default:default,org.eclipse.emf.emfstore.modelmutator@default:default,org.eclipse.emf.emfstore.performance.test@default:default,org.eclipse.emf.emfstore.server.model.edit@default:default,org.eclipse.emf.emfstore.server.model@default:default,org.eclipse.emf.emfstore.server.test@default:false,org.eclipse.emf.emfstore.server@default:default,org.eclipse.emf.emfstore.test.common@default:default,org.eclipse.emf.emfstore.test.model.edit@default:default,org.eclipse.emf.emfstore.test.model@default:default"/>
+<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="false"/>
+</launchConfiguration>
diff --git a/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
index c1e43f3..467414d 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.server.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
Bundle-ManifestVersion: 2
Bundle-Name: EMFStore Server Tests
Bundle-SymbolicName: org.eclipse.emf.emfstore.server.test
-Bundle-Version: 1.8.1.qualifier
-Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.8.1"
+Bundle-Version: 1.9.0.qualifier
+Fragment-Host: org.eclipse.emf.emfstore.client;bundle-version="1.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.emfstore.test.common;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.emfstore.server;bundle-version="[1.8.1,2.0.0)"
+ org.eclipse.emf.emfstore.server;bundle-version="[1.9.0,2.0.0)"
Export-Package: org.eclipse.emf.emfstore.server.accesscontrol.test;ver
- sion="1.8.1";x-internal:=true,org.eclipse.emf.emfstore.server.test;ve
- rsion="1.8.1";x-internal:=true
+ sion="1.9.0";x-internal:=true,org.eclipse.emf.emfstore.server.test;ve
+ rsion="1.9.0";x-internal:=true
Bundle-Vendor: Eclipse Modeling Project
diff --git a/tests/org.eclipse.emf.emfstore.server.test/pom.xml b/tests/org.eclipse.emf.emfstore.server.test/pom.xml
index 095fc2b..22c11c3 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.server.test/pom.xml
@@ -7,13 +7,13 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>org.eclipse.emf.emfstore.server.test</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java
index 26bb0ee..43ca3e2 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java
@@ -54,7 +54,7 @@
startEMFStoreWithPAProperties(
ESProjectAdminPrivileges.ShareProject,
ESProjectAdminPrivileges.AssignRoleToOrgUnit // needed for share
- );
+ );
}
@Test(expected = ESException.class)
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AllAccessControlTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AllAccessControlTests.java
index 12ad3cf..c54a7a4 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AllAccessControlTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AllAccessControlTests.java
@@ -41,7 +41,8 @@
CreateUserWithPasswordMissingPrivilegTests.class,
AdminEMFStoreTests.class,
AddInitialParticipantTest.class,
- AutoCreateACUserTestTest.class
+ AutoCreateACUserTestTest.class,
+ DefaultESPasswordHashGeneratorTests.class
})
public class AllAccessControlTests {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupMissingPrivilegeTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupMissingPrivilegeTests.java
index f11ae7b..dc2c0d6 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupMissingPrivilegeTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupMissingPrivilegeTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -31,7 +31,7 @@
/**
* Test the {@link ESProjectAdminPrivileges#ChangeAssignmentsOfOrgUnits} privilege of a project admin
* role.
- *
+ *
* @author emueller
**/
public class AssignOrgUnitToGroupMissingPrivilegeTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupTests.java
index c9a8d39..5db0e81 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignOrgUnitToGroupTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -34,9 +34,9 @@
/**
* Tests whether organizational units can be assigned to groups.
- *
+ *
* @author emueller
- *
+ *
*/
public class AssignOrgUnitToGroupTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignRoleToOrgUnitMissingPrivilegTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignRoleToOrgUnitMissingPrivilegTests.java
index d9e738b..eff893b 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignRoleToOrgUnitMissingPrivilegTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AssignRoleToOrgUnitMissingPrivilegTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -28,9 +28,9 @@
/**
* Test the missing {@link ESProjectAdminPrivileges#AssignRoleToOrgUnit} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class AssignRoleToOrgUnitMissingPrivilegTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/ChangePasswordTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/ChangePasswordTests.java
index ea01967..2679025 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/ChangePasswordTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/ChangePasswordTests.java
@@ -12,6 +12,7 @@
package org.eclipse.emf.emfstore.server.accesscontrol.test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.eclipse.emf.emfstore.client.test.common.dsl.Roles;
@@ -19,11 +20,13 @@
import org.eclipse.emf.emfstore.client.test.common.util.ServerUtil;
import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESUsersessionImpl;
+import org.eclipse.emf.emfstore.internal.server.accesscontrol.AccessControl;
import org.eclipse.emf.emfstore.internal.server.exceptions.AccessControlException;
import org.eclipse.emf.emfstore.internal.server.model.ProjectId;
import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnitId;
import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACUser;
import org.eclipse.emf.emfstore.internal.server.model.impl.api.ESGlobalProjectIdImpl;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt;
import org.eclipse.emf.emfstore.server.auth.ESProjectAdminPrivileges;
import org.eclipse.emf.emfstore.server.exceptions.ESException;
import org.junit.After;
@@ -85,7 +88,11 @@
getAdminBroker().changeRole(getProjectSpace().getProjectId(), createUser, Roles.writer());
ServerUtil.changePassword(getUsersession(), createUser, getNewUsername(), NEW_USER_PASSWORD);
final ACUser user = ServerUtil.getUser(getSuperUsersession(), createUser);
- assertEquals(NEW_USER_PASSWORD, user.getPassword());
+ final String userPass = user.getPassword();
+ final int separatorIndex = userPass.indexOf(ESHashAndSalt.SEPARATOR);
+ final String hash = userPass.substring(0, separatorIndex);
+ final String salt = userPass.substring(separatorIndex + 1);
+ assertTrue(AccessControl.getESPasswordHashGenerator().verifyPassword(NEW_USER_PASSWORD, hash, salt));
}
@Test
@@ -96,7 +103,11 @@
ESUsersessionImpl.class.cast(getUsersession()).toInternalAPI().getACUser().getId(),
getUser(), "new-password"); //$NON-NLS-1$
final ACUser user = ServerUtil.getUser(getSuperUsersession(), getUser());
- assertEquals("new-password", user.getPassword()); //$NON-NLS-1$
+ final String userPass = user.getPassword();
+ final int separatorIndex = userPass.indexOf(ESHashAndSalt.SEPARATOR);
+ final String hash = userPass.substring(0, separatorIndex);
+ final String salt = userPass.substring(separatorIndex + 1);
+ assertTrue(AccessControl.getESPasswordHashGenerator().verifyPassword("new-password", hash, salt)); //$NON-NLS-1$
}
@Test(expected = AccessControlException.class)
@@ -195,6 +206,10 @@
getAdminBroker().changeUser(newUser, getNewUsername(), NEW_USER_PASSWORD);
final ACUser user = ServerUtil.getUser(getSuperUsersession(), newUser);
- assertEquals(NEW_USER_PASSWORD, user.getPassword());
+ final String userPass = user.getPassword();
+ final int separatorIndex = userPass.indexOf(ESHashAndSalt.SEPARATOR);
+ final String hash = userPass.substring(0, separatorIndex);
+ final String salt = userPass.substring(separatorIndex + 1);
+ assertTrue(AccessControl.getESPasswordHashGenerator().verifyPassword(NEW_USER_PASSWORD, hash, salt));
}
}
\ No newline at end of file
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupMissingPrivilegeTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupMissingPrivilegeTest.java
index 338f08c..c9f5066 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupMissingPrivilegeTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupMissingPrivilegeTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -26,9 +26,9 @@
/**
* Test the missing {@link ESProjectAdminPrivileges#CreateGroup} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateGroupMissingPrivilegeTest extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupTest.java
index 01f14a6..8e28081 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateGroupTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -27,9 +27,9 @@
/**
* Test the {@link ESProjectAdminPrivileges#CreateGroup} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateGroupTest extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectMissingPrivilegTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectMissingPrivilegTest.java
index 107836c..379e257 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectMissingPrivilegTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectMissingPrivilegTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -23,9 +23,9 @@
* Test the missing {@link org.eclipse.emf.emfstore.server.auth.ESProjectAdminPrivileges
* ESProjectAdminPrivileges#ShareProject} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateProjectMissingPrivilegTest extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectTest.java
index 3cf7831..f68db8f 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateProjectTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -26,9 +26,9 @@
/**
* Test the {@link ESProjectAdminPrivileges#ShareProject} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateProjectTest extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserMissingPrivilegTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserMissingPrivilegTests.java
index 9852e86..77f9006 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserMissingPrivilegTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserMissingPrivilegTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
@@ -21,7 +21,7 @@
/**
* @author Edgar
- *
+ *
*/
public class CreateUserMissingPrivilegTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserTests.java
index 0e9b3e6..47ba375 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -27,9 +27,9 @@
/**
* Test the {@link ESProjectAdminPrivileges#CreateUser} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateUserTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordMissingPrivilegTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordMissingPrivilegTests.java
index f040b2b..952dd38 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordMissingPrivilegTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordMissingPrivilegTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -24,9 +24,9 @@
/**
* Test the missing {@link ESProjectAdminPrivileges#ChangeUserPassword} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateUserWithPasswordMissingPrivilegTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java
index 53d3f38..9ae3515 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -27,11 +27,12 @@
import org.junit.Test;
/**
- * Test the {@link ESProjectAdminPrivileges#CreateUser} and {@link ESProjectAdminPrivileges#ChangeUserPassword} privileges of a
+ * Test the {@link ESProjectAdminPrivileges#CreateUser} and {@link ESProjectAdminPrivileges#ChangeUserPassword}
+ * privileges of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class CreateUserWithPasswordTests extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DefaultESPasswordHashGeneratorTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DefaultESPasswordHashGeneratorTests.java
new file mode 100644
index 0000000..f1cb8ad
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DefaultESPasswordHashGeneratorTests.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2011-2016 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Johannes Faltermeier - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.server.accesscontrol.test;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.emf.emfstore.internal.server.accesscontrol.DefaultESPasswordHashGenerator;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator;
+import org.eclipse.emf.emfstore.server.auth.ESPasswordHashGenerator.ESHashAndSalt;
+import org.junit.Test;
+
+public class DefaultESPasswordHashGeneratorTests {
+
+ private static final String PASSWORD = "IAmPassword"; //$NON-NLS-1$
+ private static final String NOT_PASSWORD = "IAmNotPassword"; //$NON-NLS-1$
+
+ private static final String TEST_HASH = "eaf6acf17676f0b6bd554af88350c905fd0a444ec962f1840e7fabf182c79e881c3589ff66667b1f56e73a84b6585b57ef3d82e914b3584be18d3ad6e9641a9f"; //$NON-NLS-1$
+ private static final String TEST_SALT = "nPkctDB1Q45EOv6lyn5DiG14vEzAUeYhNbtKOWutolQayr2idOctVc2xpo6q4p6oUmYU1cG1q2DzQgJ0zHKctIP1SrKzEJzdAqYesRhoXLTLvGbuElGNaYBbd3eb8cRZ"; //$NON-NLS-1$
+
+ /* stateless */
+ private final ESPasswordHashGenerator passwordHashGenerator = new DefaultESPasswordHashGenerator();
+
+ @Test
+ public void testHashPasswordSamePasswordDifferentSalts() {
+ final ESHashAndSalt hash1 = passwordHashGenerator.hashPassword(PASSWORD);
+ final ESHashAndSalt hash2 = passwordHashGenerator.hashPassword(PASSWORD);
+ assertNotEquals(hash1.getSalt(), hash2.getSalt());
+ assertNotEquals(hash1.getHash(), hash2.getHash());
+ }
+
+ @Test
+ public void testVerifyPasswordMatching() {
+ assertTrue(passwordHashGenerator.verifyPassword(PASSWORD, TEST_HASH, TEST_SALT));
+ }
+
+ @Test
+ public void testVerifyPasswordNotMatching() {
+ assertFalse(passwordHashGenerator.verifyPassword(NOT_PASSWORD, TEST_HASH, TEST_SALT));
+ }
+
+ @Test
+ public void testVerifyPasswordInvalidInput() {
+ assertFalse(passwordHashGenerator.verifyPassword(null, TEST_HASH, TEST_SALT));
+ assertFalse(passwordHashGenerator.verifyPassword(PASSWORD, null, TEST_SALT));
+ assertFalse(passwordHashGenerator.verifyPassword(PASSWORD, TEST_HASH, null));
+ }
+
+}
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitMissingPrivilegeTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitMissingPrivilegeTest.java
index 18d3136..0ac4372 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitMissingPrivilegeTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitMissingPrivilegeTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -30,9 +30,9 @@
/**
* Test the {@link ESProjectAdminPrivileges#DeleteOrgUnit} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class DeleteOrgUnitMissingPrivilegeTest extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java
index 113d91d..599b0cc 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -38,9 +38,9 @@
/**
* Test the {@link ESProjectAdminPrivileges#DeleteOrgUnit} privilege of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @author emueller
- *
+ *
*/
public class DeleteOrgUnitTest extends ProjectAdminTest {
@@ -123,14 +123,10 @@
makeUserPA();
final ACOrgUnitId newUserId = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
- final ProjectId secondProjectId =
- ESGlobalProjectIdImpl.class.cast(
- ProjectUtil.share(getUsersession(), getLocalProject())
- ).toInternalAPI();
- final ProjectId thirdProjectId =
- ESGlobalProjectIdImpl.class.cast(
- ProjectUtil.share(getUsersession(), getLocalProject())
- ).toInternalAPI();
+ final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
+ ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
+ final ProjectId thirdProjectId = ESGlobalProjectIdImpl.class.cast(
+ ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
getAdminBroker().changeRole(
secondProjectId,
@@ -155,8 +151,7 @@
final ACOrgUnitId newUser = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
- ProjectUtil.share(getUsersession(), getLocalProject())
- ).toInternalAPI();
+ ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
getAdminBroker().changeRole(
secondProjectId,
@@ -183,10 +178,8 @@
makeUserPA();
final ACOrgUnitId newUser = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
- final ProjectId secondProjectId =
- ESGlobalProjectIdImpl.class.cast(
- ProjectUtil.share(getUsersession(), getLocalProject())
- ).toInternalAPI();
+ final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
+ ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
getAdminBroker().changeRole(
secondProjectId,
@@ -203,8 +196,7 @@
final ACOrgUnitId newUser = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
- ProjectUtil.share(getUsersession(), getLocalProject())
- ).toInternalAPI();
+ ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
getAdminBroker().changeRole(
secondProjectId,
newUser,
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteProjectTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteProjectTest.java
index ba38d8c..39b937b 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteProjectTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -39,9 +39,9 @@
/**
* Test whether a project admin can delete a project without deleting
* its files on the server
- *
+ *
* @author emueller
- *
+ *
*/
public class DeleteProjectTest extends ProjectAdminTest {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AdminBrokerTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AdminBrokerTests.java
index 69e649b..e42586c 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AdminBrokerTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AdminBrokerTests.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerAPITests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerAPITests.java
index 1cf9262..25aa08e 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerAPITests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/AllServerAPITests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.server.test;
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/BranchTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/BranchTests.java
index ff15874..38ebe79 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/BranchTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/BranchTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.server.test;
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/ChecksumStreamingTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/ChecksumStreamingTest.java
new file mode 100644
index 0000000..254f378
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/ChecksumStreamingTest.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.server.test;
+
+import static org.junit.Assert.assertEquals;
+
+import org.eclipse.emf.emfstore.client.ESLocalProject;
+import org.eclipse.emf.emfstore.client.test.common.cases.ESTestWithLoggedInUserMock;
+import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
+import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
+import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
+import org.eclipse.emf.emfstore.internal.common.model.util.SerializationException;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class ChecksumStreamingTest extends ESTestWithLoggedInUserMock {
+ @Override
+ @Before
+ public void before() {
+ org.junit.Assume.assumeTrue(transactionalEditingDomainNotInUse());
+ super.before();
+ }
+
+ public boolean transactionalEditingDomainNotInUse() {
+ return !ESWorkspaceProviderImpl.getInstance().getEditingDomain().getClass().getName().contains("Transactional"); //$NON-NLS-1$
+ }
+
+ @Override
+ @After
+ public void after() {
+ super.after();
+ }
+
+ @BeforeClass
+ public static void beforeClass() {
+ startEMFStore();
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ stopEMFStore();
+ }
+
+ @Test
+ public void testChecksumOptimization() throws SerializationException {
+ final long checksumStreaming = computeChecksumStreamingOrNonStreaming(getLocalProject(), true);
+ System.out.println("Checksum streaming: " + checksumStreaming); //$NON-NLS-1$
+ final long checksum = computeChecksumStreamingOrNonStreaming(getLocalProject(), false);
+ System.out.println("Checksum old: " + checksum); //$NON-NLS-1$
+ assertEquals(checksum, checksumStreaming);
+
+ }
+
+ private static long computeChecksumStreamingOrNonStreaming(ESLocalProject localProject,
+ boolean useStreamingCalculation)
+ throws SerializationException {
+ final ProjectSpace projectSpace = ((ESLocalProjectImpl) localProject).toInternalAPI();
+ final long checksum = useStreamingCalculation ? ModelUtil.computeChecksum(projectSpace.getProject())
+ : ModelUtil.computeChecksumLegacy(projectSpace.getProject());
+ System.out.println(ModelUtil.eObjectToString(projectSpace.getProject()));
+ return checksum;
+ }
+}
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/HistoryAPITests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/HistoryAPITests.java
index 7f83d3e..5828cfc 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/HistoryAPITests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/HistoryAPITests.java
@@ -1,431 +1,519 @@
-/*******************************************************************************
- * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
- * Technische Universitaet Muenchen.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Otto von Wesendonk - initial API and implementation
- * Edgar Mueller - Performance refactorings
- ******************************************************************************/
-package org.eclipse.emf.emfstore.server.test;
-
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.addElement;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.branch;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.checkout;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.commit;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.defaultName;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.mergeWithBranch;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.rename;
-import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.share;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.emfstore.client.ESLocalProject;
-import org.eclipse.emf.emfstore.client.ESServer;
-import org.eclipse.emf.emfstore.client.ESUsersession;
-import org.eclipse.emf.emfstore.client.exceptions.ESServerStartFailedException;
-import org.eclipse.emf.emfstore.client.test.common.dsl.Create;
-import org.eclipse.emf.emfstore.client.test.common.dsl.CreateAPI;
-import org.eclipse.emf.emfstore.client.test.common.util.ServerUtil;
-import org.eclipse.emf.emfstore.common.model.ESModelElementId;
-import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
-import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
-import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
-import org.eclipse.emf.emfstore.internal.server.exceptions.FatalESException;
-import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidVersionSpecException;
-import org.eclipse.emf.emfstore.server.exceptions.ESException;
-import org.eclipse.emf.emfstore.server.model.ESHistoryInfo;
-import org.eclipse.emf.emfstore.server.model.query.ESHistoryQuery;
-import org.eclipse.emf.emfstore.server.model.query.ESModelElementQuery;
-import org.eclipse.emf.emfstore.server.model.query.ESPathQuery;
-import org.eclipse.emf.emfstore.server.model.query.ESRangeQuery;
-import org.eclipse.emf.emfstore.server.model.versionspec.ESPrimaryVersionSpec;
-import org.eclipse.emf.emfstore.server.model.versionspec.ESVersionSpec;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * Branches for history test
- *
- * <pre>
- * b1 b2 b3
- *
- * v7 o
- * / |
- * v6 / o
- * v5 o /
- * v4 o | /
- * v3 | o
- * v2 o /
- * v1 \ o
- * |
- * v0 o
- * </pre>
- *
- * @author wesendon
- * @author emueller
- */
-public class HistoryAPITests {
-
- public static final ESPrimaryVersionSpec[] VERSIONS = {
- ESVersionSpec.FACTORY.createPRIMARY("trunk", 0), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("trunk", 1), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("b1", 2), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("b2", 3), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("b1", 4), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("b2", 5), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("b3", 6), //$NON-NLS-1$
- ESVersionSpec.FACTORY.createPRIMARY("b3", 7) }; //$NON-NLS-1$
-
- public static final String[] ELEMENT_NAMES = { "v0", //$NON-NLS-1$
- "v1", //$NON-NLS-1$
- "v2", //$NON-NLS-1$
- "v3", //$NON-NLS-1$
- "v4", //$NON-NLS-1$
- "v5", //$NON-NLS-1$
- "v6", //$NON-NLS-1$
- "v7" //$NON-NLS-1$
- };
-
- public static final String[] BRANCHES = { "b1", //$NON-NLS-1$
- "b2", //$NON-NLS-1$
- "b3" //$NON-NLS-1$
- };
-
- private static ESServer server;
- private static ESUsersession session;
- private static ESLocalProject readOnlyProject;
-
- @BeforeClass
- public static void beforeClass() {
- try {
- server = ServerUtil.startMockServer().getServer();
- session = server.login(
- ServerUtil.superUser(),
- ServerUtil.superUserPassword());
- readOnlyProject = createHistory();
- } catch (final IllegalArgumentException ex) {
- fail(ex.getMessage());
- } catch (final ESServerStartFailedException ex) {
- fail(ex.getMessage());
- } catch (final FatalESException ex) {
- fail(ex.getMessage());
- } catch (final ESException ex) {
- fail(ex.getMessage());
- }
- }
-
- @AfterClass
- public static void afterClass() {
- ServerUtil.stopServer();
- }
-
- public static ESLocalProject getProject() {
- final ProjectSpace clone = ModelUtil.clone(((ESLocalProjectImpl) readOnlyProject).toInternalAPI());
- clone.setProject(ModelUtil.clone(((ESLocalProjectImpl) readOnlyProject).toInternalAPI().getProject()));
- return clone.toAPI();
- }
-
- public static ESLocalProject createHistory() throws ESException {
- final ESLocalProject localProject = CreateAPI.project(defaultName());
- share(session, localProject);
-
- // v0
- final TestElement testElement = Create.testElement(ELEMENT_NAMES[0]);
- addElement(localProject, testElement);
- share(session, localProject);
- assertEquals(VERSIONS[0], localProject.getBaseVersion());
-
- // v1
- rename(localProject, ELEMENT_NAMES[1]);
- assertEquals(VERSIONS[1], commit(localProject).getBaseVersion());
- final ESLocalProject localProject2 = checkout(localProject);
-
- // v2
- rename(localProject, ELEMENT_NAMES[2]);
- final ESLocalProject branch2 = branch(localProject, BRANCHES[0]);
- assertEquals(VERSIONS[2], branch2.getBaseVersion());
-
- // v3
- rename(localProject2, ELEMENT_NAMES[3]);
- final ESLocalProject branch3 = branch(localProject2, BRANCHES[1]);
- assertEquals(VERSIONS[3], branch3.getBaseVersion());
-
- // v4
- rename(localProject, ELEMENT_NAMES[4]);
- assertEquals(VERSIONS[4], commit(localProject).getBaseVersion());
-
- // v5
- rename(localProject2, ELEMENT_NAMES[5]);
- assertEquals(VERSIONS[5], commit(localProject2).getBaseVersion());
-
- // v6
- final ESLocalProject localProject3 = checkout(localProject, VERSIONS[3]);
- rename(localProject3, ELEMENT_NAMES[6]);
- assertEquals(VERSIONS[6], branch(localProject3, BRANCHES[2]).getBaseVersion());
-
- // v7
- mergeWithBranch(localProject3, VERSIONS[5], 1);
- rename(localProject3, ELEMENT_NAMES[7]);
- final ESLocalProject commit2 = commit(localProject3);
- assertEquals(VERSIONS[7], commit2.getBaseVersion());
-
- return localProject;
- }
-
- @Test
- public void rangeQuery() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 5, 25, false, false, false,
- false);
-
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(4, result.size());
- assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
- assertEquals(VERSIONS[0], result.get(3).getPrimarySpec());
- }
-
- @Test
- public void rangequeryAllVersions() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 5, 25, true, false, false,
- false);
-
- final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery,
- new NullProgressMonitor());
-
- assertEquals(8, result.size());
- assertEquals(VERSIONS[7], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[6], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[5], result.get(2).getPrimarySpec());
- assertEquals(VERSIONS[4], result.get(3).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(4).getPrimarySpec());
- assertEquals(VERSIONS[2], result.get(5).getPrimarySpec());
- assertEquals(VERSIONS[1], result.get(6).getPrimarySpec());
- assertEquals(VERSIONS[0], result.get(7).getPrimarySpec());
- }
-
- @Test
- public void rangequeryIncludeCp() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 1,
- 25, false, false, false, true);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(4, result.size());
- assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
- assertEquals(VERSIONS[0], result.get(3).getPrimarySpec());
-
- assertTrue(result.get(0).getChangePackage() != null);
- assertTrue(result.get(1).getChangePackage() != null);
- assertTrue(result.get(2).getChangePackage() != null);
- // version 0
- assertTrue(result.get(3).getChangePackage() == null);
- }
-
- @Test
- public void rangequeryNoUpper() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[5], 5,
- 1, false, false, false, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(2, result.size());
- assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
- }
-
- @Test
- public void rangequeryNoLower() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[0], 1,
- 20, false, false, false, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(2, result.size());
- assertEquals(VERSIONS[1], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[0], result.get(1).getPrimarySpec());
- }
-
- @Test
- public void rangequeryLimitZero() throws ESException {
- final ESLocalProject localProject = getProject();
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[0], 0,
- 0, false, false, false, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(1, result.size());
- assertEquals(VERSIONS[0], result.get(0).getPrimarySpec());
- }
-
- @Test
- public void rangequeryIncoming() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[7], 0,
- 2, false, true, false, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(3, result.size());
- assertEquals(VERSIONS[7], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[6], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[5], result.get(2).getPrimarySpec());
- }
-
- @Test
- public void rangequeryOutgoing() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 2,
- 0, false, false, true, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(rangeQuery, new NullProgressMonitor());
-
- assertEquals(3, result.size());
- assertEquals(VERSIONS[6], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[5], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(2).getPrimarySpec());
- }
-
- @Test
- public void pathQuery() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[0], VERSIONS[5], false, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(pathQuery, new NullProgressMonitor());
-
- assertEquals(4, result.size());
- assertEquals(VERSIONS[0], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[1], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(2).getPrimarySpec());
- assertEquals(VERSIONS[5], result.get(3).getPrimarySpec());
- }
-
- @Test
- public void pathQueryInverse() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[5], VERSIONS[0], false, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(pathQuery, new NullProgressMonitor());
-
- assertEquals(4, result.size());
- assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
- assertEquals(VERSIONS[0], result.get(3).getPrimarySpec());
- }
-
- @Test
- public void pathQueryAllVersions() throws ESException {
- final ESLocalProject localProject = getProject();
-
- final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[1], VERSIONS[3], true, false);
- final List<ESHistoryInfo> result = localProject
- .getHistoryInfos(pathQuery, new NullProgressMonitor());
-
- assertEquals(3, result.size());
- assertEquals(VERSIONS[1], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[2], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(2).getPrimarySpec());
- }
-
- @Test(expected = InvalidVersionSpecException.class)
- public void invalidPathQuery() throws ESException {
- final ESLocalProject ploEsLocalProject = getProject();
- final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[2], VERSIONS[3], false, false);
- ploEsLocalProject.getHistoryInfos(pathQuery, new NullProgressMonitor());
- }
-
- @Test
- public void meQuery() throws ESException {
- final ESLocalProject localProject = getProject();
- final EObject element = localProject.getModelElements().get(0);
- final ESModelElementId modelElementId = localProject.getModelElementId(element);
-
- final ESModelElementQuery modelElementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[3],
- modelElementId, 0, 0, false, false);
- final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelElementQuery,
- new NullProgressMonitor());
-
- assertEquals(1, result.size());
- assertEquals(VERSIONS[3], result.get(0).getPrimarySpec());
- }
-
- @Test
- public void meQueryLimit() throws ESException {
- final ESLocalProject localProject = getProject();
- final EObject element = localProject.getModelElements().get(0);
- final ESModelElementId id = localProject.getModelElementId(element);
-
- final ESModelElementQuery modelElementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[1],
- id, 0, 1, false, false);
- final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelElementQuery,
- new NullProgressMonitor());
-
- assertEquals(2, result.size());
- assertEquals(VERSIONS[1], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[0], result.get(1).getPrimarySpec());
- }
-
- @Test
- public void meQueryDifferentBranch() throws ESException {
- final ESLocalProject localProject = getProject();
- final EObject element = localProject.getModelElements().get(0);
- final ESModelElementId id = localProject.getModelElementId(element);
-
- final ESModelElementQuery modelelementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[3],
- id, 1, 1, false, false);
- final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelelementQuery,
- new NullProgressMonitor());
-
- assertEquals(3, result.size());
- assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
- }
-
- @Test
- public void meQueryDifferentBranchIncludeAll() throws ESException {
- final ESLocalProject localProject = getProject();
- final EObject element = localProject.getModelElements().get(0);
- final ESModelElementId id = localProject.getModelElementId(element);
-
- final ESModelElementQuery modelElementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[3],
- id, 1, 1, true, false);
- final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelElementQuery,
- new NullProgressMonitor());
-
- assertEquals(3, result.size());
- assertEquals(VERSIONS[4], result.get(0).getPrimarySpec());
- assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
- assertEquals(VERSIONS[2], result.get(2).getPrimarySpec());
- }
-}
+/*******************************************************************************
+ * Copyright (c) 2008-2011 Chair for Applied Software Engineering,
+ * Technische Universitaet Muenchen.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Otto von Wesendonk - initial API and implementation
+ * Edgar Mueller - Performance refactorings
+ ******************************************************************************/
+package org.eclipse.emf.emfstore.server.test;
+
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.addElement;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.branch;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.checkout;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.commit;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.defaultName;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.mergeWithBranch;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.rename;
+import static org.eclipse.emf.emfstore.client.test.common.util.ProjectUtil.share;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.client.ESLocalProject;
+import org.eclipse.emf.emfstore.client.ESServer;
+import org.eclipse.emf.emfstore.client.ESUsersession;
+import org.eclipse.emf.emfstore.client.exceptions.ESServerStartFailedException;
+import org.eclipse.emf.emfstore.client.test.common.dsl.Add;
+import org.eclipse.emf.emfstore.client.test.common.dsl.Create;
+import org.eclipse.emf.emfstore.client.test.common.dsl.CreateAPI;
+import org.eclipse.emf.emfstore.client.test.common.util.ServerUtil;
+import org.eclipse.emf.emfstore.client.util.ESVoidCallable;
+import org.eclipse.emf.emfstore.client.util.RunESCommand;
+import org.eclipse.emf.emfstore.common.model.ESModelElementId;
+import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
+import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
+import org.eclipse.emf.emfstore.internal.server.exceptions.FatalESException;
+import org.eclipse.emf.emfstore.internal.server.exceptions.InvalidVersionSpecException;
+import org.eclipse.emf.emfstore.server.exceptions.ESException;
+import org.eclipse.emf.emfstore.server.model.ESHistoryInfo;
+import org.eclipse.emf.emfstore.server.model.query.ESHistoryQuery;
+import org.eclipse.emf.emfstore.server.model.query.ESModelElementQuery;
+import org.eclipse.emf.emfstore.server.model.query.ESPathQuery;
+import org.eclipse.emf.emfstore.server.model.query.ESRangeQuery;
+import org.eclipse.emf.emfstore.server.model.versionspec.ESPrimaryVersionSpec;
+import org.eclipse.emf.emfstore.server.model.versionspec.ESVersionSpec;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Branches for history test
+ *
+ * <pre>
+ * b1 b2 b3
+ *
+ * v7 o
+ * / |
+ * v6 / o
+ * v5 o /
+ * v4 o | /
+ * v3 | o
+ * v2 o /
+ * v1 \ o
+ * |
+ * v0 o
+ * </pre>
+ *
+ * @author wesendon
+ * @author emueller
+ */
+public class HistoryAPITests {
+
+ static final NullProgressMonitor NPM = new NullProgressMonitor();
+
+ public static final ESPrimaryVersionSpec[] VERSIONS = {
+ ESVersionSpec.FACTORY.createPRIMARY("trunk", 0), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("trunk", 1), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("b1", 2), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("b2", 3), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("b1", 4), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("b2", 5), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("b3", 6), //$NON-NLS-1$
+ ESVersionSpec.FACTORY.createPRIMARY("b3", 7) }; //$NON-NLS-1$
+
+ public static final String[] ELEMENT_NAMES = { "v0", //$NON-NLS-1$
+ "v1", //$NON-NLS-1$
+ "v2", //$NON-NLS-1$
+ "v3", //$NON-NLS-1$
+ "v4", //$NON-NLS-1$
+ "v5", //$NON-NLS-1$
+ "v6", //$NON-NLS-1$
+ "v7" //$NON-NLS-1$
+ };
+
+ public static final String[] BRANCHES = { "b1", //$NON-NLS-1$
+ "b2", //$NON-NLS-1$
+ "b3" //$NON-NLS-1$
+ };
+
+ private static ESServer server;
+ private static ESUsersession session;
+ private static ESLocalProject readOnlyProject;
+
+ @BeforeClass
+ public static void beforeClass() {
+ try {
+ server = ServerUtil.startMockServer().getServer();
+ session = server.login(
+ ServerUtil.superUser(),
+ ServerUtil.superUserPassword());
+ readOnlyProject = createHistory();
+ } catch (final IllegalArgumentException ex) {
+ fail(ex.getMessage());
+ } catch (final ESServerStartFailedException ex) {
+ fail(ex.getMessage());
+ } catch (final FatalESException ex) {
+ fail(ex.getMessage());
+ } catch (final ESException ex) {
+ fail(ex.getMessage());
+ }
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ ServerUtil.stopServer();
+ }
+
+ public static ESLocalProject getProject() {
+ final ProjectSpace clone = ModelUtil.clone(((ESLocalProjectImpl) readOnlyProject).toInternalAPI());
+ clone.setProject(ModelUtil.clone(((ESLocalProjectImpl) readOnlyProject).toInternalAPI().getProject()));
+ return clone.toAPI();
+ }
+
+ public static ESLocalProject createHistory() throws ESException {
+ final ESLocalProject localProject = CreateAPI.project(defaultName());
+ share(session, localProject);
+
+ // v0
+ final TestElement testElement = Create.testElement(ELEMENT_NAMES[0]);
+ addElement(localProject, testElement);
+ share(session, localProject);
+ assertEquals(VERSIONS[0], localProject.getBaseVersion());
+
+ // v1
+ rename(localProject, ELEMENT_NAMES[1]);
+ assertEquals(VERSIONS[1], commit(localProject).getBaseVersion());
+ final ESLocalProject localProject2 = checkout(localProject);
+
+ // v2
+ rename(localProject, ELEMENT_NAMES[2]);
+ final ESLocalProject branch2 = branch(localProject, BRANCHES[0]);
+ assertEquals(VERSIONS[2], branch2.getBaseVersion());
+
+ // v3
+ rename(localProject2, ELEMENT_NAMES[3]);
+ final ESLocalProject branch3 = branch(localProject2, BRANCHES[1]);
+ assertEquals(VERSIONS[3], branch3.getBaseVersion());
+
+ // v4
+ rename(localProject, ELEMENT_NAMES[4]);
+ assertEquals(VERSIONS[4], commit(localProject).getBaseVersion());
+
+ // v5
+ rename(localProject2, ELEMENT_NAMES[5]);
+ assertEquals(VERSIONS[5], commit(localProject2).getBaseVersion());
+
+ // v6
+ final ESLocalProject localProject3 = checkout(localProject, VERSIONS[3]);
+ rename(localProject3, ELEMENT_NAMES[6]);
+ assertEquals(VERSIONS[6], branch(localProject3, BRANCHES[2]).getBaseVersion());
+
+ // v7
+ mergeWithBranch(localProject3, VERSIONS[5], 1);
+ rename(localProject3, ELEMENT_NAMES[7]);
+ final ESLocalProject commit2 = commit(localProject3);
+ assertEquals(VERSIONS[7], commit2.getBaseVersion());
+
+ return localProject;
+ }
+
+ @Test
+ public void rangeQuery() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 5, 25, false, false, false,
+ false);
+
+ final List<ESHistoryInfo> result = localProject
+ .getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(4, result.size());
+ assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
+ assertEquals(VERSIONS[0], result.get(3).getPrimarySpec());
+ }
+
+ @Test
+ public void rangequeryAllVersions() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 5, 25, true, false, false,
+ false);
+
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(8, result.size());
+ assertEquals(VERSIONS[7], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[6], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[5], result.get(2).getPrimarySpec());
+ assertEquals(VERSIONS[4], result.get(3).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(4).getPrimarySpec());
+ assertEquals(VERSIONS[2], result.get(5).getPrimarySpec());
+ assertEquals(VERSIONS[1], result.get(6).getPrimarySpec());
+ assertEquals(VERSIONS[0], result.get(7).getPrimarySpec());
+ }
+
+ @Test
+ public void rangequeryIncludeCp() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 1,
+ 25, false, false, false, true);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(4, result.size());
+ assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
+ assertEquals(VERSIONS[0], result.get(3).getPrimarySpec());
+
+ assertTrue(result.get(0).getChangePackage() != null);
+ assertTrue(result.get(1).getChangePackage() != null);
+ assertTrue(result.get(2).getChangePackage() != null);
+ // version 0
+ assertTrue(result.get(3).getChangePackage() == null);
+ }
+
+ @Test
+ public void rangequeryNoUpper() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[5], 5,
+ 1, false, false, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(2, result.size());
+ assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
+ }
+
+ @Test
+ public void rangequeryNoLower() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[0], 1,
+ 20, false, false, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(2, result.size());
+ assertEquals(VERSIONS[1], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[0], result.get(1).getPrimarySpec());
+ }
+
+ @Test
+ public void rangequeryLimitZero() throws ESException {
+ final ESLocalProject localProject = getProject();
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[0], 0,
+ 0, false, false, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(1, result.size());
+ assertEquals(VERSIONS[0], result.get(0).getPrimarySpec());
+ }
+
+ @Test
+ public void rangequeryIncoming() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[7], 0,
+ 2, false, true, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(3, result.size());
+ assertEquals(VERSIONS[7], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[6], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[5], result.get(2).getPrimarySpec());
+ }
+
+ @Test
+ public void rangequeryOutgoing() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(VERSIONS[3], 2,
+ 0, false, false, true, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(rangeQuery, NPM);
+
+ assertEquals(3, result.size());
+ assertEquals(VERSIONS[6], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[5], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(2).getPrimarySpec());
+ }
+
+ @Test
+ public void pathQuery() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[0], VERSIONS[5], false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(pathQuery, NPM);
+
+ assertEquals(4, result.size());
+ assertEquals(VERSIONS[0], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[1], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(2).getPrimarySpec());
+ assertEquals(VERSIONS[5], result.get(3).getPrimarySpec());
+ }
+
+ @Test
+ public void pathQueryInverse() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[5], VERSIONS[0], false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(pathQuery, NPM);
+
+ assertEquals(4, result.size());
+ assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
+ assertEquals(VERSIONS[0], result.get(3).getPrimarySpec());
+ }
+
+ @Test
+ public void pathQueryAllVersions() throws ESException {
+ final ESLocalProject localProject = getProject();
+
+ final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[1], VERSIONS[3], true, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(pathQuery, NPM);
+
+ assertEquals(3, result.size());
+ assertEquals(VERSIONS[1], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[2], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(2).getPrimarySpec());
+ }
+
+ @Test(expected = InvalidVersionSpecException.class)
+ public void invalidPathQuery() throws ESException {
+ final ESLocalProject ploEsLocalProject = getProject();
+ final ESPathQuery pathQuery = ESHistoryQuery.FACTORY.pathQuery(VERSIONS[2], VERSIONS[3], false, false);
+ ploEsLocalProject.getHistoryInfos(pathQuery, NPM);
+ }
+
+ @Test
+ public void meQuery() throws ESException {
+ final ESLocalProject localProject = getProject();
+ final EObject element = localProject.getModelElements().get(0);
+ final ESModelElementId modelElementId = localProject.getModelElementId(element);
+
+ final ESModelElementQuery modelElementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[3],
+ modelElementId, 0, 0, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelElementQuery, NPM);
+
+ assertEquals(1, result.size());
+ assertEquals(VERSIONS[3], result.get(0).getPrimarySpec());
+ }
+
+ @Test
+ public void meQueryLimit() throws ESException {
+ final ESLocalProject localProject = getProject();
+ final EObject element = localProject.getModelElements().get(0);
+ final ESModelElementId id = localProject.getModelElementId(element);
+
+ final ESModelElementQuery modelElementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[1],
+ id, 0, 1, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelElementQuery, NPM);
+
+ assertEquals(2, result.size());
+ assertEquals(VERSIONS[1], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[0], result.get(1).getPrimarySpec());
+ }
+
+ @Test
+ public void meQueryDifferentBranch() throws ESException {
+ final ESLocalProject localProject = getProject();
+ final EObject element = localProject.getModelElements().get(0);
+ final ESModelElementId id = localProject.getModelElementId(element);
+
+ final ESModelElementQuery modelelementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[3],
+ id, 1, 1, false, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelelementQuery, NPM);
+
+ assertEquals(3, result.size());
+ assertEquals(VERSIONS[5], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[1], result.get(2).getPrimarySpec());
+ }
+
+ @Test
+ public void meQueryDifferentBranchIncludeAll() throws ESException {
+ final ESLocalProject localProject = getProject();
+ final EObject element = localProject.getModelElements().get(0);
+ final ESModelElementId id = localProject.getModelElementId(element);
+
+ final ESModelElementQuery modelElementQuery = ESHistoryQuery.FACTORY.modelElementQuery(VERSIONS[3],
+ id, 1, 1, true, false);
+ final List<ESHistoryInfo> result = localProject.getHistoryInfos(modelElementQuery, NPM);
+
+ assertEquals(3, result.size());
+ assertEquals(VERSIONS[4], result.get(0).getPrimarySpec());
+ assertEquals(VERSIONS[3], result.get(1).getPrimarySpec());
+ assertEquals(VERSIONS[2], result.get(2).getPrimarySpec());
+ }
+
+ @Test
+ public void getSingleVersionViaRangeQuery() throws ESException {
+ final ESLocalProject project = Create.project("Test Project"); //$NON-NLS-1$
+ project.shareProject(NPM);
+
+ // Create three versions
+ Add.toProject(project, Create.testElement("A")); //$NON-NLS-1$
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("B")); //$NON-NLS-1$
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("C")); //$NON-NLS-1$
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("D")); //$NON-NLS-1$
+ project.commit(NPM);
+
+ final ESPrimaryVersionSpec wantedVersion = ESVersionSpec.FACTORY.createPRIMARY(1);
+
+ final ESRangeQuery<?> rangeQuery = ESHistoryQuery.FACTORY.rangeQuery(wantedVersion, 1, 0, false, false, false,
+ false);
+ final List<ESHistoryInfo> historyInfos = project.getHistoryInfos(rangeQuery, NPM);
+ assertEquals(2, historyInfos.size());
+ assertEquals(2, historyInfos.get(0).getPrimarySpec().getIdentifier());
+ assertEquals(1, historyInfos.get(1).getPrimarySpec().getIdentifier());
+ }
+
+ @Test
+ public void modelElementQueryWithoutIncludingChangePackages() throws ESException {
+ final ESLocalProject project = Create.project("Test Project"); //$NON-NLS-1$
+ project.shareProject(NPM);
+
+ // Create four versions
+ Add.toProject(project, Create.testElement("A")); //$NON-NLS-1$
+ project.commit(NPM);
+ final TestElement b = Create.testElement("B"); //$NON-NLS-1$
+ Add.toProject(project, b);
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("C")); //$NON-NLS-1$
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("D")); //$NON-NLS-1$
+ project.commit(NPM);
+
+ RunESCommand.run(new ESVoidCallable() {
+ @Override
+ public void run() {
+ b.setName("BB"); //$NON-NLS-1$
+ }
+ });
+ project.commit(NPM);
+
+ final ESModelElementId modelElementId = project.getModelElementId(b);
+
+ final ESModelElementQuery query = ESHistoryQuery.FACTORY.modelElementQuery(
+ project.getBaseVersion(), modelElementId, 0, 50, false, false);
+
+ final List<ESHistoryInfo> historyInfos = project.getHistoryInfos(query, NPM);
+ assertNull(historyInfos.get(0).getChangePackage());
+ assertNull(historyInfos.get(1).getChangePackage());
+ assertEquals(historyInfos.size(), 2);
+ }
+
+ @Test
+ public void modelElementQueryWithIncludingChangePackages() throws ESException {
+ final ESLocalProject project = Create.project("Test Project"); //$NON-NLS-1$
+ project.shareProject(NPM);
+
+ // Create four versions
+ Add.toProject(project, Create.testElement("A")); //$NON-NLS-1$
+ project.commit(NPM);
+ final TestElement b = Create.testElement("B"); //$NON-NLS-1$
+ Add.toProject(project, b);
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("C")); //$NON-NLS-1$
+ project.commit(NPM);
+ Add.toProject(project, Create.testElement("D")); //$NON-NLS-1$
+ project.commit(NPM);
+
+ RunESCommand.run(new ESVoidCallable() {
+ @Override
+ public void run() {
+ b.setName("BB"); //$NON-NLS-1$
+ }
+ });
+ project.commit(NPM);
+
+ final ESModelElementId modelElementId = project.getModelElementId(b);
+
+ final ESModelElementQuery query = ESHistoryQuery.FACTORY.modelElementQuery(
+ project.getBaseVersion(), modelElementId, 0, 50, false, true);
+
+ final List<ESHistoryInfo> historyInfos = project.getHistoryInfos(query, NPM);
+ assertNotNull(historyInfos.get(0).getChangePackage());
+ assertNotNull(historyInfos.get(1).getChangePackage());
+ assertEquals(historyInfos.size(), 2);
+ }
+}
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java
index 2b07963..5a6a01a 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java
@@ -166,7 +166,7 @@
try {
testAllInvalidCombinations(connectionManager.getClass().getMethod("createVersion", //$NON-NLS-1$
new Class[] { SessionId.class, ProjectId.class, PrimaryVersionSpec.class, AbstractChangePackage.class,
- BranchVersionSpec.class, PrimaryVersionSpec.class, LogMessage.class }));
+ BranchVersionSpec.class, PrimaryVersionSpec.class, LogMessage.class }));
} catch (final SecurityException e) {
throw new ESException(e);
} catch (final NoSuchMethodException e) {
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/PropertiesTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/PropertiesTest.java
index d4e7912..264b099 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/PropertiesTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/PropertiesTest.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.server.test;
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/TransmissionTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/TransmissionTests.java
index 8f10ac4..e6f2269 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/TransmissionTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/TransmissionTests.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.server.test;
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/VersionVerifierTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/VersionVerifierTest.java
index 433fd3b..4d95bc9 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/VersionVerifierTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/VersionVerifierTest.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -22,7 +22,7 @@
/**
* Version verifier test.
- *
+ *
* @author emueller
*/
public class VersionVerifierTest {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.test.common/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
index 9878721..a450b9c 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.emfstore.test.common/META-INF/MANIFEST.MF
@@ -6,25 +6,26 @@
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.emfstore.test.model;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.client;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.client;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.junit;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.8.1,2.0.0)";visibility:=reexport,
+ org.eclipse.emf.emfstore.examplemodel;bundle-version="[1.9.0,2.0.0)";visibility:=reexport,
org.eclipse.emf.emfstore.test.model.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.core.resources;bundle-version="[3.8.1,4.0.0)"
Export-Package: org.eclipse.emf.emfstore.client.test.common;version="2.0.0";x-friends:="org.eclipse.emf.emfstore.client.api.test",
org.eclipse.emf.emfstore.client.test.common.builders;version="2.0.0";x-friends:="org.eclipse.emf.emfstore.server.test",
org.eclipse.emf.emfstore.client.test.common.cases;version="2.0.0";
- x-friends:="org.eclipse.emf.emfstore.client.changetracking.test,
+ x-friends:="org.eclipse.emf.emfstore.client.api.test,
+ org.eclipse.emf.emfstore.client.changetracking.test,
org.eclipse.emf.emfstore.client.conflictdetection.test,
+ org.eclipse.emf.emfstore.client.example.test,
org.eclipse.emf.emfstore.client.recording.test,
org.eclipse.emf.emfstore.client.test,
org.eclipse.emf.emfstore.client.test.ui,
- org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.client.ui.test,
org.eclipse.emf.emfstore.fuzzy.emf.test,
- org.eclipse.emf.emfstore.client.example.test,
org.eclipse.emf.emfstore.performance.test,
- org.eclipse.emf.emfstore.client.api.test,
- org.eclipse.emf.emfstore.client.ui.test",
+ org.eclipse.emf.emfstore.server.test,
+ org.eclipse.emf.emfstore.ecore.test",
org.eclipse.emf.emfstore.client.test.common.config;version="2.0.0";x-internal:=true,
org.eclipse.emf.emfstore.client.test.common.dsl;version="2.0.0";
x-friends:="org.eclipse.emf.emfstore.server.test,
@@ -35,7 +36,8 @@
org.eclipse.emf.emfstore.client.test,
org.eclipse.emf.emfstore.client.test.ui,
org.eclipse.emf.emfstore.client.api.test,
- org.eclipse.emf.emfstore.client.ui.test",
+ org.eclipse.emf.emfstore.client.ui.test,
+ org.eclipse.emf.emfstore.ecore.test",
org.eclipse.emf.emfstore.client.test.common.mocks;version="2.0.0";x-friends:="org.eclipse.emf.emfstore.server.test",
org.eclipse.emf.emfstore.client.test.common.util;version="2.0.0";
x-friends:="org.eclipse.emf.emfstore.server.test,
@@ -47,5 +49,6 @@
org.eclipse.emf.emfstore.fuzzy.emf.test,
org.eclipse.emf.emfstore.performance.test,
org.eclipse.emf.emfstore.client.api.test,
- org.eclipse.emf.emfstore.fuzzy.emf"
+ org.eclipse.emf.emfstore.fuzzy.emf,
+ org.eclipse.emf.emfstore.ecore.test"
Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.emf.emfstore.test.common/pom.xml b/tests/org.eclipse.emf.emfstore.test.common/pom.xml
index 57c0013..84518e9 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.test.common/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestConflictResolver.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestConflictResolver.java
index 26c7057..988e626 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestConflictResolver.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestConflictResolver.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common;
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestSessionProvider2.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestSessionProvider2.java
index 0a45460..9d08ef4 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestSessionProvider2.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/TestSessionProvider2.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* emueller
******************************************************************************/
@@ -24,7 +24,7 @@
/**
* A session provider implementation meant to be used by any tests.
- *
+ *
* @author emueller
*/
public final class TestSessionProvider2 extends ESAbstractSessionProvider {
@@ -35,7 +35,7 @@
/**
* Returns the singleton instance.
- *
+ *
* @return the singleton instance
*/
public static TestSessionProvider2 getInstance() {
@@ -44,7 +44,7 @@
/**
* Returns the default {@link Usersession}.
- *
+ *
* @return the default user session
* @throws ESException if anything else fails
*/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/BOOL.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/BOOL.java
index 50dae5b..f5662ec 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/BOOL.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/BOOL.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -13,9 +13,9 @@
/**
* Util class to enable typesafe builder pattern.
- *
+ *
* @author emueller
- *
+ *
*/
public class BOOL {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/UserBuilder.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/UserBuilder.java
index 43819a3..4af836a 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/UserBuilder.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/builders/UserBuilder.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java
index b356c34..3a53de0 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java
@@ -73,8 +73,8 @@
RunESCommand.run(new Callable<Void>() {
public Void call() throws Exception {
if (isCompareAtEnd) {
- final ESCloseableIterable<AbstractOperation> operations =
- getProjectSpace().getLocalChangePackage().operations();
+ final ESCloseableIterable<AbstractOperation> operations = getProjectSpace().getLocalChangePackage()
+ .operations();
try {
clonedProjectSpace.applyOperations(operations.iterable(), false);
} finally {
@@ -116,7 +116,8 @@
clonedProjectSpace.save();
assertTrue(
- MessageFormat.format("Projects are not equal.\n\n{0}\n\n{1}", projectString, clonedProjectString), areEqual); //$NON-NLS-1$
+ MessageFormat.format("Projects are not equal.\n\n{0}\n\n{1}", projectString, clonedProjectString), //$NON-NLS-1$
+ areEqual);
}
super.after();
}
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java
index 03090ba..1da4dbd 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java
@@ -89,8 +89,7 @@
}
CommonUtil.setTesting(true);
final ESLocalProject project = Create.project(ProjectUtil.defaultName());
- projectSpace = (ProjectSpaceBase) ESLocalProjectImpl.class.cast(project
- ).toInternalAPI();
+ projectSpace = (ProjectSpaceBase) ESLocalProjectImpl.class.cast(project).toInternalAPI();
}
@After
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithLoggedInUserMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithLoggedInUserMock.java
index b219b3d..fbfd2cf 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithLoggedInUserMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithLoggedInUserMock.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common.cases;
@@ -41,9 +41,9 @@
* <br/>
* <b>NOTE</b>: Remember to call {@code startEMFStore()} and {@code stopEMFStore()} respectively in
* {@code beforeClass()} and {@code afterClass()}.
- *
+ *
* @author emueller
- *
+ *
*/
public abstract class ESTestWithLoggedInUserMock extends ESTestWithMockServer {
@@ -71,7 +71,7 @@
/**
* Returns the name of the user that is used by the test.
- *
+ *
* @return the user name
*/
public String getUser() {
@@ -80,7 +80,7 @@
/**
* Returns the password of the user that is used by the test to login the user.
- *
+ *
* @return the password to be used to perform the login.
*/
public String getPassword() {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithMockServer.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithMockServer.java
index aca74b0..b86b54e 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithMockServer.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithMockServer.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -31,9 +31,9 @@
/**
* ES test case base class with mock server available.
- *
+ *
* @author emueller
- *
+ *
*/
public class ESTestWithMockServer extends ESTest {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithRemoteProject.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithRemoteProject.java
index 8a18dce..37c5c9e 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithRemoteProject.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithRemoteProject.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common.cases;
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithSharedProject.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithSharedProject.java
index e026a01..6f62873 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithSharedProject.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTestWithSharedProject.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common.cases;
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ClientLocationProvider.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ClientLocationProvider.java
index 8174043..81a94a7 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ClientLocationProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ClientLocationProvider.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common.config;
@@ -16,9 +16,9 @@
public class ClientLocationProvider extends DefaultWorkspaceLocationProvider {
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.client.model.util.DefaultWorkspaceLocationProvider#getRootDirectory()
*/
@Override
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ServerLocationProvider.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ServerLocationProvider.java
index 895481d..c9c6f4b 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ServerLocationProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/config/ServerLocationProvider.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common.config;
@@ -16,9 +16,9 @@
public class ServerLocationProvider extends DefaultServerWorkspaceLocationProvider {
/**
- *
+ *
* {@inheritDoc}
- *
+ *
* @see org.eclipse.emf.emfstore.internal.server.DefaultServerWorkspaceLocationProvider#getRootDirectory()
*/
@Override
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Add.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Add.java
index 19652d8..59dba5b 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Add.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Add.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -22,7 +22,7 @@
/**
* Utility class to ease adding elements to a project within a wrapping command.
- *
+ *
*/
public final class Add {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/CreateAPI.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/CreateAPI.java
index b8afa4e..c1fbce2 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/CreateAPI.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/CreateAPI.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Delete.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Delete.java
index 3faca58..90538d3 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Delete.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Delete.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -32,6 +32,7 @@
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESServerImpl;
import org.eclipse.emf.emfstore.internal.common.model.Project;
+import org.eclipse.emf.emfstore.internal.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.internal.server.model.SessionId;
import org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnitId;
import org.eclipse.emf.emfstore.server.exceptions.ESException;
@@ -119,6 +120,16 @@
});
}
+ public static void fromProject(final EObject eObject) {
+ RunESCommand.run(new ESVoidCallable() {
+ @Override
+ public void run() {
+ final Project project = ModelUtil.getProject(eObject);
+ project.deleteModelElement(eObject);
+ }
+ });
+ }
+
public static void allRemoteProjects(ESServer server, ESUsersession session) throws ESException {
for (final ESRemoteProject project : server.getRemoteProjects()) {
project.delete(session, new NullProgressMonitor());
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Roles.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Roles.java
index cd83daf..8a03aa1 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Roles.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Roles.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -16,7 +16,7 @@
/**
* Convenience class for handling {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role Role}s.
- *
+ *
* @author
*/
public final class Roles {
@@ -28,7 +28,7 @@
/**
* Returns the {@link EClass} of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.WriterRole WriterRole}.
- *
+ *
* @return the WriterRole EClass
*/
public static EClass writer() {
@@ -38,7 +38,7 @@
/**
* Returns the {@link EClass} of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ReaderRole ReaderRole}.
- *
+ *
* @return the ReaderRole EClass
*/
public static EClass reader() {
@@ -48,7 +48,7 @@
/**
* Returns the {@link EClass} of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
- *
+ *
* @return the ProjectAdminRole EClass
*/
public static EClass projectAdmin() {
@@ -58,7 +58,7 @@
/**
* Returns the {@link EClass} of a
* {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ServerAdmin ServerAdmin}.
- *
+ *
* @return the ServerAdmin EClass
*/
public static EClass serverAdmin() {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/TestElementFeatures.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/TestElementFeatures.java
index 9c294e3..e603af1 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/TestElementFeatures.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/TestElementFeatures.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Update.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Update.java
index b2d1fec..2239d1f 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Update.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/dsl/Update.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -19,9 +19,9 @@
/**
* Convenience class for change the attribute of a {@link TestElement}.
- *
+ *
* @author emuller
- *
+ *
*/
public final class Update {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
index 1e83511..e7b0547 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
@@ -114,7 +114,7 @@
final PrimaryVersionSpec baseVersionSpec, final AbstractChangePackage changePackage,
final BranchVersionSpec targetBranch,
final PrimaryVersionSpec sourceVersion, final LogMessage logMessage)
- throws ESException, InvalidVersionSpecException {
+ throws ESException, InvalidVersionSpecException {
AbstractChangePackage cp = changePackage;
final SessionId clonedSessionId = checkSessionId(sessionId);
@@ -130,7 +130,7 @@
public PrimaryVersionSpec resolveVersionSpec(final SessionId sessionId, final ProjectId projectId,
final VersionSpec versionSpec)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
return ModelUtil.clone(
@@ -158,7 +158,7 @@
public List<HistoryInfo> getHistoryInfo(final SessionId sessionId, final ProjectId projectId,
final HistoryQuery<?> historyQuery)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
return ModelUtil.clone(
emfStore.getHistoryInfo(
@@ -169,7 +169,7 @@
public void addTag(final SessionId sessionId, final ProjectId projectId, final PrimaryVersionSpec versionSpec,
final TagVersionSpec tag)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
emfStore.addTag(
clonedSessionId,
@@ -180,7 +180,7 @@
public void removeTag(final SessionId sessionId, final ProjectId projectId, final PrimaryVersionSpec versionSpec,
final TagVersionSpec tag)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
emfStore.removeTag(
clonedSessionId,
@@ -191,7 +191,7 @@
public ProjectInfo createEmptyProject(final SessionId sessionId, final String name, final String description,
final LogMessage logMessage)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
final ProjectInfo projectInfo = emfStore.createEmptyProject(clonedSessionId, name, description,
ModelUtil.clone(logMessage));
@@ -251,7 +251,7 @@
public FileTransferInformation uploadFileChunk(final SessionId sessionId, final ProjectId projectId,
final FileChunk fileChunk)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
return emfStore.uploadFileChunk(clonedSessionId, ModelUtil.clone(projectId), fileChunk);
}
@@ -264,7 +264,7 @@
public void transmitProperty(final SessionId sessionId, final OrgUnitProperty changedProperty, final ACUser user,
final ProjectId projectId)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
emfStore.transmitProperty(
clonedSessionId,
@@ -326,7 +326,7 @@
*/
public String uploadChangePackageFragment(final SessionId sessionId, final ProjectId projectId,
final ChangePackageEnvelope envelope)
- throws ESException {
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
@@ -337,18 +337,20 @@
}
/**
+ *
* {@inheritDoc}
*
* @see org.eclipse.emf.emfstore.internal.server.EMFStore#downloadChangePackageFragment(org.eclipse.emf.emfstore.internal.server.model.SessionId,
- * java.lang.String, int)
+ * org.eclipse.emf.emfstore.internal.server.model.ProjectId, java.lang.String, int)
*/
- public ChangePackageEnvelope downloadChangePackageFragment(final SessionId sessionId, final String proxyId,
- final int fragmentIndex)
- throws ESException {
+ public ChangePackageEnvelope downloadChangePackageFragment(final SessionId sessionId, ProjectId projectId,
+ final String proxyId, final int fragmentIndex)
+ throws ESException {
final SessionId clonedSessionId = checkSessionId(sessionId);
return ModelUtil.clone(
emfStore.downloadChangePackageFragment(
clonedSessionId,
+ projectId,
proxyId,
fragmentIndex));
}
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/DAOFacadeMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/DAOFacadeMock.java
index 7c4d7b2..44fb5bf 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/DAOFacadeMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/DAOFacadeMock.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/MockServerSpace.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/MockServerSpace.java
index 7a6e47b..b3637e7 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/MockServerSpace.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/MockServerSpace.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ResourceFactoryMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ResourceFactoryMock.java
index 2a7ad9f..64aa932 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ResourceFactoryMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ResourceFactoryMock.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Otto von Wesendonk - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ServerMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ServerMock.java
index 2df954e..2cd7710 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ServerMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ServerMock.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/CommitCallbackAdapter.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/CommitCallbackAdapter.java
index dfa754b..9de7afb 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/CommitCallbackAdapter.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/CommitCallbackAdapter.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
******************************************************************************/
package org.eclipse.emf.emfstore.client.test.common.util;
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/FilteredSuite.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/FilteredSuite.java
index b310167..74d3249 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/FilteredSuite.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/FilteredSuite.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* JulianSommerfeldt
* jsommerfeldt
@@ -27,15 +27,15 @@
/**
* {@link Suite} to filter tests and run only when runFuzzyTests system property is true.
- *
+ *
* @author Julian Sommerfeldt
- *
+ *
*/
public class FilteredSuite extends Suite {
/**
* Called reflectively on classes annotated with <code>@RunWith(Suite.class)</code>.
- *
+ *
* @param klass the root class
* @param builder builds runners for classes in the suite
* @throws InitializationError if a class could not be initialized.
@@ -67,9 +67,9 @@
/**
* Annotation to configure the system parameters.
- *
+ *
* @author jsommerfeldt
- *
+ *
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ ElementType.TYPE })
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Messages.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Messages.java
index 4b9a1d8..e975c4c 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Messages.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Messages.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2011-2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
@@ -15,7 +15,7 @@
/**
* Utility classes related messages.
- *
+ *
* @author emueller
* @generated
*/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java
index cc0ab58..6bfdcbf 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java
@@ -99,8 +99,8 @@
}
public static void deleteRemoteProjects(ESServer server, ESUsersession usersession) throws IOException,
- FatalESException,
- ESException {
+ FatalESException,
+ ESException {
for (final ESRemoteProject project : server.getRemoteProjects(usersession)) {
project.delete(usersession, new NullProgressMonitor());
}
@@ -240,7 +240,7 @@
public static ESLocalProject tag(ESLocalProject localProject, ESPrimaryVersionSpec versionSpec, String branchName,
String tag)
- throws ESException {
+ throws ESException {
final ESTagVersionSpec tagVersionSpec = CreateAPI.tagVersionSpec(branchName, tag);
localProject.addTag(versionSpec, tagVersionSpec, nullProgressMonitor());
return localProject;
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
index 686d75f..c6fe9b7 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
@@ -384,7 +384,8 @@
try {
FileUtil.copyFile(new URL("platform:/plugin/" //$NON-NLS-1$
+ element.getIConfigurationElement().getNamespaceIdentifier() + "/" + attribute) //$NON-NLS-1$
- .openConnection().getInputStream(), targetFile);
+ .openConnection().getInputStream(),
+ targetFile);
return;
} catch (final IOException e) {
ModelUtil.logWarning("Copy of file from " + source + " to " + target + " failed", e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -404,8 +405,7 @@
// TODO: duplicate method
private static InputStream getResource(String resource) throws IOException {
- final URL configURL =
- FrameworkUtil.getBundle(ServerUtil.class).getEntry(resource);
+ final URL configURL = FrameworkUtil.getBundle(ServerUtil.class).getEntry(resource);
// Activator.getDefault().getBundle().getBundleContext().getBundle()
// .getEntry(resource);
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestLogListener.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestLogListener.java
index 7b2c449..fbe8b53 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestLogListener.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestLogListener.java
@@ -5,7 +5,7 @@
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - intial API and implementation
******************************************************************************/
@@ -17,9 +17,9 @@
/**
* Utility class that may be used to verify that a certain log message
* has been logged.
- *
+ *
* @author emueller
- *
+ *
*/
public class TestLogListener implements ILogListener {
@@ -28,7 +28,7 @@
/**
* Constructor.
- *
+ *
* @param expectedMessage
* the message that is expected to be logged.
*/
@@ -38,7 +38,7 @@
/**
* {@inheritDoc}
- *
+ *
* @see org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime.IStatus, java.lang.String)
*/
public void logging(IStatus status, String plugin) {
@@ -49,7 +49,7 @@
/**
* Whether the listener received the exepected message.
- *
+ *
* @return {@code true}, if the listener did receive the expected message, {@code false} otherwise
*/
public boolean didReceive() {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestSessionProvider.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestSessionProvider.java
index 048f1da..a5e56fc 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestSessionProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/TestSessionProvider.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Times.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Times.java
index 0ebd829..6466027 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Times.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/Times.java
@@ -1,11 +1,11 @@
/*******************************************************************************
* Copyright (c) 2014 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
******************************************************************************/
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml b/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
index 091e2d3..35e422a 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java
index 9f51b96..1de72ff 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java
@@ -21,8 +21,7 @@
*
* @generated
*/
-public final class TestmodelEditPlugin extends EMFPlugin
-{
+public final class TestmodelEditPlugin extends EMFPlugin {
/**
* Keep track of the singleton.
* <!-- begin-user-doc -->
@@ -48,11 +47,9 @@
*
* @generated
*/
- public TestmodelEditPlugin()
- {
- super(new ResourceLocator[]
- {
- });
+ public TestmodelEditPlugin() {
+ super(new ResourceLocator[] {
+ });
}
/**
@@ -64,8 +61,7 @@
* @generated
*/
@Override
- public ResourceLocator getPluginResourceLocator()
- {
+ public ResourceLocator getPluginResourceLocator() {
return plugin;
}
@@ -77,8 +73,7 @@
* @return the singleton instance.
* @generated
*/
- public static Implementation getPlugin()
- {
+ public static Implementation getPlugin() {
return plugin;
}
@@ -89,8 +84,7 @@
*
* @generated
*/
- public static class Implementation extends EclipsePlugin
- {
+ public static class Implementation extends EclipsePlugin {
/**
* Creates an instance.
* <!-- begin-user-doc -->
@@ -98,8 +92,7 @@
*
* @generated
*/
- public Implementation()
- {
+ public Implementation() {
super();
// Remember the static instance.
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java
index fb66192..6269f3b 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -40,11 +41,8 @@
public class StringToStringMapItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -52,8 +50,7 @@
*
* @generated
*/
- public StringToStringMapItemProvider(AdapterFactory adapterFactory)
- {
+ public StringToStringMapItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -65,10 +62,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addKeyPropertyDescriptor(object);
@@ -84,16 +79,13 @@
*
* @generated
*/
- protected void addKeyPropertyDescriptor(Object object)
- {
+ protected void addKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_StringToStringMap_key_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_StringToStringMap_key_feature", "_UI_StringToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_StringToStringMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_StringToStringMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.STRING_TO_STRING_MAP__KEY,
true,
false,
@@ -110,16 +102,13 @@
*
* @generated
*/
- protected void addValuePropertyDescriptor(Object object)
- {
+ protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_StringToStringMap_value_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_StringToStringMap_value_feature", "_UI_StringToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_StringToStringMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_StringToStringMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.STRING_TO_STRING_MAP__VALUE,
true,
false,
@@ -137,8 +126,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/StringToStringMap")); //$NON-NLS-1$
}
@@ -150,8 +138,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final Map.Entry<?, ?> stringToStringMap = (Map.Entry<?, ?>) object;
return "" + stringToStringMap.getKey() + " -> " + stringToStringMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -165,12 +152,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Map.Entry.class))
- {
+ switch (notification.getFeatureID(Map.Entry.class)) {
case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
@@ -188,8 +173,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -201,8 +185,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return TestmodelEditPlugin.INSTANCE;
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java
index 40651c8..b2009b6 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -40,11 +41,8 @@
public class StringToTestElementMapItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -52,8 +50,7 @@
*
* @generated
*/
- public StringToTestElementMapItemProvider(AdapterFactory adapterFactory)
- {
+ public StringToTestElementMapItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -65,10 +62,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addValuePropertyDescriptor(object);
@@ -84,16 +79,13 @@
*
* @generated
*/
- protected void addValuePropertyDescriptor(Object object)
- {
+ protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_StringToTestElementMap_value_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_value_feature", "_UI_StringToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_StringToTestElementMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP__VALUE,
true,
false,
@@ -110,16 +102,13 @@
*
* @generated
*/
- protected void addKeyPropertyDescriptor(Object object)
- {
+ protected void addKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_StringToTestElementMap_key_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_key_feature", "_UI_StringToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_StringToTestElementMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP__KEY,
true,
false,
@@ -137,8 +126,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/StringToTestElementMap")); //$NON-NLS-1$
}
@@ -150,8 +138,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final Map.Entry<?, ?> stringToTestElementMap = (Map.Entry<?, ?>) object;
return "" + stringToTestElementMap.getKey() + " -> " + stringToTestElementMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -165,12 +152,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Map.Entry.class))
- {
+ switch (notification.getFeatureID(Map.Entry.class)) {
case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
@@ -187,8 +172,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -200,8 +184,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return TestmodelEditPlugin.INSTANCE;
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java
index a248d5f..b633914 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java
@@ -45,8 +45,7 @@
extends ItemProviderAdapter
implements
IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
- IItemPropertySource
-{
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -54,8 +53,7 @@
*
* @generated
*/
- public TestElementItemProvider(AdapterFactory adapterFactory)
- {
+ public TestElementItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -67,10 +65,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addNamePropertyDescriptor(object);
@@ -95,12 +91,9 @@
*
* @generated
*/
- protected void addNamePropertyDescriptor(Object object)
- {
+ protected void addNamePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestElement_name_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -120,11 +113,9 @@
*
* @generated
*/
- protected void addStringsPropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addStringsPropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_strings_feature"), //$NON-NLS-1$
getString(
@@ -145,12 +136,9 @@
*
* @generated
*/
- protected void addReferencesPropertyDescriptor(Object object)
- {
+ protected void addReferencesPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_references_feature"), //$NON-NLS-1$
getString(
@@ -171,11 +159,9 @@
*
* @generated
*/
- protected void addReferencePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addReferencePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_reference_feature"), //$NON-NLS-1$
getString(
@@ -196,16 +182,14 @@
*
* @generated
*/
- protected void addOtherReferencePropertyDescriptor(Object object)
- {
+ protected void addOtherReferencePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_otherReference_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_otherReference_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_otherReference_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__OTHER_REFERENCE,
true,
false,
@@ -222,16 +206,14 @@
*
* @generated
*/
- protected void addDescriptionPropertyDescriptor(Object object)
- {
+ protected void addDescriptionPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_description_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_description_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__DESCRIPTION,
true,
false,
@@ -248,16 +230,14 @@
*
* @generated
*/
- protected void addNonContained_NTo1PropertyDescriptor(Object object)
- {
+ protected void addNonContained_NTo1PropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_nonContained_NTo1_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NTo1_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NTo1_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_NTO1,
true,
false,
@@ -274,16 +254,14 @@
*
* @generated
*/
- protected void addNonContained_1ToNPropertyDescriptor(Object object)
- {
+ protected void addNonContained_1ToNPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_nonContained_1ToN_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_1ToN_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_1ToN_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_1TO_N,
true,
false,
@@ -300,16 +278,14 @@
*
* @generated
*/
- protected void addNonContained_NToMPropertyDescriptor(Object object)
- {
+ protected void addNonContained_NToMPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_nonContained_NToM_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NToM_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NToM_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_NTO_M,
true,
false,
@@ -326,16 +302,14 @@
*
* @generated
*/
- protected void addNonContained_MToNPropertyDescriptor(Object object)
- {
+ protected void addNonContained_MToNPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_nonContained_MToN_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_MToN_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_MToN_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_MTO_N,
true,
false,
@@ -352,16 +326,14 @@
*
* @generated
*/
- protected void addContainedElements_NoOppositePropertyDescriptor(Object object)
- {
+ protected void addContainedElements_NoOppositePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElement_containedElements_NoOpposite_feature"), //$NON-NLS-1$
getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElement_containedElements_NoOpposite_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ "_UI_PropertyDescriptor_description", "_UI_TestElement_containedElements_NoOpposite_feature", //$NON-NLS-1$ //$NON-NLS-2$
+ "_UI_TestElement_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE,
true,
false,
@@ -381,10 +353,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS);
childrenFeatures.add(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT);
@@ -408,8 +378,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -424,8 +393,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestElement")); //$NON-NLS-1$
}
@@ -437,11 +405,9 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final String label = ((TestElement) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_TestElement_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TestElement_type") : //$NON-NLS-1$
getString("_UI_TestElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -454,12 +420,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TestElement.class))
- {
+ switch (notification.getFeatureID(TestElement.class)) {
case TestmodelPackage.TEST_ELEMENT__NAME:
case TestmodelPackage.TEST_ELEMENT__STRINGS:
case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
@@ -489,73 +453,47 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS,
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS,
+ TestmodelFactory.eINSTANCE.createTestElement()));
+
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT,
+ TestmodelFactory.eINSTANCE.createTestElement()));
+
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_MAP,
+ TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP)));
+
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_STRING_MAP,
+ TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_STRING_MAP)));
+
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_TO_STRING_MAP,
+ TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP)));
+
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_ELEMENT_MAP,
+ TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP)));
+
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2,
+ TestmodelFactory.eINSTANCE.createTestElement()));
+
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE,
TestmodelFactory.eINSTANCE.createTestElement()));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT,
- TestmodelFactory.eINSTANCE.createTestElement()));
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
+ TestmodelFactory.eINSTANCE.createTestElement())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_MAP,
- TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP)));
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
+ TestmodelFactory.eINSTANCE.createTestElement())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_STRING_MAP,
- TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_STRING_MAP)));
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
+ TestmodelFactory.eINSTANCE.createTestElement()));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_TO_STRING_MAP,
- TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP)));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_ELEMENT_MAP,
- TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP)));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2,
- TestmodelFactory.eINSTANCE.createTestElement()));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE,
- TestmodelFactory.eINSTANCE.createTestElement()));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
- TestmodelFactory.eINSTANCE.createTestElement())));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
- TestmodelFactory.eINSTANCE.createTestElement())));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
- TestmodelFactory.eINSTANCE.createTestElement()));
-
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
- TestmodelFactory.eINSTANCE.createTestElement()));
+ newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
+ TestmodelFactory.eINSTANCE.createTestElement()));
}
/**
@@ -566,29 +504,25 @@
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
- {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
Object childFeature = feature;
Object childObject = child;
if (childFeature instanceof EStructuralFeature
- && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature))
- {
+ && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
final FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
childFeature = entry.getEStructuralFeature();
childObject = entry.getValue();
}
- final boolean qualify =
- childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS ||
- childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT ||
- childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2 ||
- childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE ||
- childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1 ||
- childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2;
+ final boolean qualify = childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS ||
+ childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT ||
+ childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2 ||
+ childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE ||
+ childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1 ||
+ childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2;
- if (qualify)
- {
+ if (qualify) {
return getString("_UI_CreateChild_text2", //$NON-NLS-1$
new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
@@ -603,8 +537,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return TestmodelEditPlugin.INSTANCE;
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java
index bf805fd..b754752 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -40,11 +41,8 @@
public class TestElementToStringMapItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -52,8 +50,7 @@
*
* @generated
*/
- public TestElementToStringMapItemProvider(AdapterFactory adapterFactory)
- {
+ public TestElementToStringMapItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -65,10 +62,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addValuePropertyDescriptor(object);
@@ -84,16 +79,13 @@
*
* @generated
*/
- protected void addValuePropertyDescriptor(Object object)
- {
+ protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElementToStringMap_value_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_value_feature", "_UI_TestElementToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestElementToStringMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP__VALUE,
true,
false,
@@ -110,16 +102,13 @@
*
* @generated
*/
- protected void addKeyPropertyDescriptor(Object object)
- {
+ protected void addKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElementToStringMap_key_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_key_feature", "_UI_TestElementToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestElementToStringMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP__KEY,
true,
false,
@@ -137,8 +126,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestElementToStringMap")); //$NON-NLS-1$
}
@@ -150,8 +138,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final Map.Entry<?, ?> testElementToStringMap = (Map.Entry<?, ?>) object;
return "" + testElementToStringMap.getKey() + " -> " + testElementToStringMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -165,12 +152,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Map.Entry.class))
- {
+ switch (notification.getFeatureID(Map.Entry.class)) {
case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
@@ -187,8 +172,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -200,8 +184,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return TestmodelEditPlugin.INSTANCE;
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java
index 60604b1..294af75 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java
@@ -23,6 +23,7 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
@@ -38,11 +39,8 @@
public class TestElementToTestElementMapItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -50,8 +48,7 @@
*
* @generated
*/
- public TestElementToTestElementMapItemProvider(AdapterFactory adapterFactory)
- {
+ public TestElementToTestElementMapItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -63,10 +60,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addValuePropertyDescriptor(object);
@@ -82,16 +77,13 @@
*
* @generated
*/
- protected void addValuePropertyDescriptor(Object object)
- {
+ protected void addValuePropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElementToTestElementMap_value_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_value_feature", "_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE,
true,
false,
@@ -108,16 +100,13 @@
*
* @generated
*/
- protected void addKeyPropertyDescriptor(Object object)
- {
+ protected void addKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestElementToTestElementMap_key_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_key_feature", "_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY,
true,
false,
@@ -135,8 +124,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestElementToTestElementMap")); //$NON-NLS-1$
}
@@ -148,8 +136,7 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final Map.Entry<?, ?> testElementToTestElementMap = (Map.Entry<?, ?>) object;
return "" + testElementToTestElementMap.getKey() + " -> " + testElementToTestElementMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -163,8 +150,7 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
super.notifyChanged(notification);
}
@@ -178,8 +164,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -191,8 +176,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return TestmodelEditPlugin.INSTANCE;
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java
index 9b15a90..b1d5813 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java
@@ -22,6 +22,7 @@
import org.eclipse.emf.edit.provider.IItemLabelProvider;
import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -40,11 +41,8 @@
public class TestTypeItemProvider
extends ItemProviderAdapter
implements
- IEditingDomainItemProvider,
- ITreeItemContentProvider,
- IItemLabelProvider,
- IItemPropertySource
-{
+ IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+ IItemPropertySource {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -52,8 +50,7 @@
*
* @generated
*/
- public TestTypeItemProvider(AdapterFactory adapterFactory)
- {
+ public TestTypeItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -65,10 +62,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addNamePropertyDescriptor(object);
@@ -83,11 +78,9 @@
*
* @generated
*/
- protected void addNamePropertyDescriptor(Object object)
- {
- itemPropertyDescriptors.add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ protected void addNamePropertyDescriptor(Object object) {
+ itemPropertyDescriptors
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TestType_name_feature"), //$NON-NLS-1$
getString("_UI_PropertyDescriptor_description", "_UI_TestType_name_feature", "_UI_TestType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -108,8 +101,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TestType")); //$NON-NLS-1$
}
@@ -121,11 +113,9 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final String label = ((TestType) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_TestType_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TestType_type") : //$NON-NLS-1$
getString("_UI_TestType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -138,12 +128,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TestType.class))
- {
+ switch (notification.getFeatureID(TestType.class)) {
case TestmodelPackage.TEST_TYPE__NAME:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
@@ -160,8 +148,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
@@ -173,8 +160,7 @@
* @generated
*/
@Override
- public ResourceLocator getResourceLocator()
- {
+ public ResourceLocator getResourceLocator() {
return TestmodelEditPlugin.INSTANCE;
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java
index 4c230a1..814359f 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java
@@ -42,8 +42,7 @@
* @generated
*/
public class TestmodelItemProviderAdapterFactory extends TestmodelAdapterFactory implements ComposeableAdapterFactory,
- IChangeNotifier, IDisposable
-{
+ IChangeNotifier, IDisposable {
/**
* This keeps track of the root adapter factory that delegates to this adapter factory.
* <!-- begin-user-doc -->
@@ -78,8 +77,7 @@
*
* @generated
*/
- public TestmodelItemProviderAdapterFactory()
- {
+ public TestmodelItemProviderAdapterFactory() {
supportedTypes.add(IEditingDomainItemProvider.class);
supportedTypes.add(IStructuredItemContentProvider.class);
supportedTypes.add(ITreeItemContentProvider.class);
@@ -105,10 +103,8 @@
* @generated
*/
@Override
- public Adapter createTestElementAdapter()
- {
- if (testElementItemProvider == null)
- {
+ public Adapter createTestElementAdapter() {
+ if (testElementItemProvider == null) {
testElementItemProvider = new TestElementItemProvider(this);
}
@@ -132,10 +128,8 @@
* @generated
*/
@Override
- public Adapter createTestElementToStringMapAdapter()
- {
- if (testElementToStringMapItemProvider == null)
- {
+ public Adapter createTestElementToStringMapAdapter() {
+ if (testElementToStringMapItemProvider == null) {
testElementToStringMapItemProvider = new TestElementToStringMapItemProvider(this);
}
@@ -159,10 +153,8 @@
* @generated
*/
@Override
- public Adapter createStringToStringMapAdapter()
- {
- if (stringToStringMapItemProvider == null)
- {
+ public Adapter createStringToStringMapAdapter() {
+ if (stringToStringMapItemProvider == null) {
stringToStringMapItemProvider = new StringToStringMapItemProvider(this);
}
@@ -186,10 +178,8 @@
* @generated
*/
@Override
- public Adapter createTestElementToTestElementMapAdapter()
- {
- if (testElementToTestElementMapItemProvider == null)
- {
+ public Adapter createTestElementToTestElementMapAdapter() {
+ if (testElementToTestElementMapItemProvider == null) {
testElementToTestElementMapItemProvider = new TestElementToTestElementMapItemProvider(this);
}
@@ -213,10 +203,8 @@
* @generated
*/
@Override
- public Adapter createStringToTestElementMapAdapter()
- {
- if (stringToTestElementMapItemProvider == null)
- {
+ public Adapter createStringToTestElementMapAdapter() {
+ if (stringToTestElementMapItemProvider == null) {
stringToTestElementMapItemProvider = new StringToTestElementMapItemProvider(this);
}
@@ -240,10 +228,8 @@
* @generated
*/
@Override
- public Adapter createTestTypeAdapter()
- {
- if (testTypeItemProvider == null)
- {
+ public Adapter createTestTypeAdapter() {
+ if (testTypeItemProvider == null) {
testTypeItemProvider = new TestTypeItemProvider(this);
}
@@ -268,10 +254,8 @@
* @generated
*/
@Override
- public Adapter createTypeWithFeatureMapNonContainmentAdapter()
- {
- if (typeWithFeatureMapNonContainmentItemProvider == null)
- {
+ public Adapter createTypeWithFeatureMapNonContainmentAdapter() {
+ if (typeWithFeatureMapNonContainmentItemProvider == null) {
typeWithFeatureMapNonContainmentItemProvider = new TypeWithFeatureMapNonContainmentItemProvider(this);
}
@@ -296,10 +280,8 @@
* @generated
*/
@Override
- public Adapter createTypeWithFeatureMapContainmentAdapter()
- {
- if (typeWithFeatureMapContainmentItemProvider == null)
- {
+ public Adapter createTypeWithFeatureMapContainmentAdapter() {
+ if (typeWithFeatureMapContainmentItemProvider == null) {
typeWithFeatureMapContainmentItemProvider = new TypeWithFeatureMapContainmentItemProvider(this);
}
@@ -313,8 +295,7 @@
*
* @generated
*/
- public ComposeableAdapterFactory getRootAdapterFactory()
- {
+ public ComposeableAdapterFactory getRootAdapterFactory() {
return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
}
@@ -325,8 +306,7 @@
*
* @generated
*/
- public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
- {
+ public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
this.parentAdapterFactory = parentAdapterFactory;
}
@@ -337,8 +317,7 @@
* @generated
*/
@Override
- public boolean isFactoryForType(Object type)
- {
+ public boolean isFactoryForType(Object type) {
return supportedTypes.contains(type) || super.isFactoryForType(type);
}
@@ -350,8 +329,7 @@
* @generated
*/
@Override
- public Adapter adapt(Notifier notifier, Object type)
- {
+ public Adapter adapt(Notifier notifier, Object type) {
return super.adapt(notifier, this);
}
@@ -362,13 +340,10 @@
* @generated
*/
@Override
- public Object adapt(Object object, Object type)
- {
- if (isFactoryForType(type))
- {
+ public Object adapt(Object object, Object type) {
+ if (isFactoryForType(type)) {
final Object adapter = super.adapt(object, type);
- if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
- {
+ if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
return adapter;
}
}
@@ -383,8 +358,7 @@
*
* @generated
*/
- public void addListener(INotifyChangedListener notifyChangedListener)
- {
+ public void addListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.addListener(notifyChangedListener);
}
@@ -395,8 +369,7 @@
*
* @generated
*/
- public void removeListener(INotifyChangedListener notifyChangedListener)
- {
+ public void removeListener(INotifyChangedListener notifyChangedListener) {
changeNotifier.removeListener(notifyChangedListener);
}
@@ -407,12 +380,10 @@
*
* @generated
*/
- public void fireNotifyChanged(Notification notification)
- {
+ public void fireNotifyChanged(Notification notification) {
changeNotifier.fireNotifyChanged(notification);
- if (parentAdapterFactory != null)
- {
+ if (parentAdapterFactory != null) {
parentAdapterFactory.fireNotifyChanged(notification);
}
}
@@ -424,8 +395,7 @@
*
* @generated
*/
- public void dispose()
- {
+ public void dispose() {
if (testElementItemProvider != null) {
testElementItemProvider.dispose();
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java
index 2eb77b7..2716587 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java
@@ -30,8 +30,7 @@
*
* @generated
*/
-public class TypeWithFeatureMapContainmentItemProvider extends TestTypeItemProvider
-{
+public class TypeWithFeatureMapContainmentItemProvider extends TestTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -39,8 +38,7 @@
*
* @generated
*/
- public TypeWithFeatureMapContainmentItemProvider(AdapterFactory adapterFactory)
- {
+ public TypeWithFeatureMapContainmentItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -52,10 +50,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
}
@@ -72,10 +68,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
}
@@ -89,8 +83,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -105,8 +98,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TypeWithFeatureMapContainment")); //$NON-NLS-1$
}
@@ -118,11 +110,9 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final String label = ((TypeWithFeatureMapContainment) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_TypeWithFeatureMapContainment_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TypeWithFeatureMapContainment_type") : //$NON-NLS-1$
getString("_UI_TypeWithFeatureMapContainment_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -135,12 +125,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TypeWithFeatureMapContainment.class))
- {
+ switch (notification.getFeatureID(TypeWithFeatureMapContainment.class)) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
@@ -157,8 +145,7 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java
index a739b74..d7eaee6 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java
@@ -34,8 +34,7 @@
*
* @generated
*/
-public class TypeWithFeatureMapNonContainmentItemProvider extends TestTypeItemProvider
-{
+public class TypeWithFeatureMapNonContainmentItemProvider extends TestTypeItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
@@ -43,8 +42,7 @@
*
* @generated
*/
- public TypeWithFeatureMapNonContainmentItemProvider(AdapterFactory adapterFactory)
- {
+ public TypeWithFeatureMapNonContainmentItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -56,10 +54,8 @@
* @generated
*/
@Override
- public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
- {
- if (itemPropertyDescriptors == null)
- {
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
addFirstKeyPropertyDescriptor(object);
@@ -75,16 +71,13 @@
*
* @generated
*/
- protected void addFirstKeyPropertyDescriptor(Object object)
- {
+ protected void addFirstKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TypeWithFeatureMapNonContainment_firstKey_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TypeWithFeatureMapNonContainment_firstKey_feature", "_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", "_UI_TypeWithFeatureMapNonContainment_firstKey_feature", //$NON-NLS-1$//$NON-NLS-2$
+ "_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
true,
false,
@@ -101,16 +94,14 @@
*
* @generated
*/
- protected void addSecondKeyPropertyDescriptor(Object object)
- {
+ protected void addSecondKeyPropertyDescriptor(Object object) {
itemPropertyDescriptors
- .add
- (createItemPropertyDescriptor
- (((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+ .add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
getString("_UI_TypeWithFeatureMapNonContainment_secondKey_feature"), //$NON-NLS-1$
- getString(
- "_UI_PropertyDescriptor_description", "_UI_TypeWithFeatureMapNonContainment_secondKey_feature", "_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+ "_UI_TypeWithFeatureMapNonContainment_secondKey_feature", //$NON-NLS-1$
+ "_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$
TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
true,
false,
@@ -130,10 +121,8 @@
* @generated
*/
@Override
- public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
- {
- if (childrenFeatures == null)
- {
+ public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+ if (childrenFeatures == null) {
super.getChildrenFeatures(object);
childrenFeatures.add(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
}
@@ -147,8 +136,7 @@
* @generated
*/
@Override
- protected EStructuralFeature getChildFeature(Object object, Object child)
- {
+ protected EStructuralFeature getChildFeature(Object object, Object child) {
// Check the type of the specified child object and return the proper feature to use for
// adding (see {@link AddCommand}) it as a child.
@@ -163,8 +151,7 @@
* @generated
*/
@Override
- public Object getImage(Object object)
- {
+ public Object getImage(Object object) {
return overlayImage(object, getResourceLocator().getImage("full/obj16/TypeWithFeatureMapNonContainment")); //$NON-NLS-1$
}
@@ -176,11 +163,9 @@
* @generated
*/
@Override
- public String getText(Object object)
- {
+ public String getText(Object object) {
final String label = ((TypeWithFeatureMapNonContainment) object).getName();
- return label == null || label.length() == 0 ?
- getString("_UI_TypeWithFeatureMapNonContainment_type") : //$NON-NLS-1$
+ return label == null || label.length() == 0 ? getString("_UI_TypeWithFeatureMapNonContainment_type") : //$NON-NLS-1$
getString("_UI_TypeWithFeatureMapNonContainment_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
}
@@ -193,12 +178,10 @@
* @generated
*/
@Override
- public void notifyChanged(Notification notification)
- {
+ public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(TypeWithFeatureMapNonContainment.class))
- {
+ switch (notification.getFeatureID(TypeWithFeatureMapNonContainment.class)) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
@@ -215,51 +198,38 @@
* @generated
*/
@Override
- protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
- {
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
super.collectNewChildDescriptors(newChildDescriptors, object);
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
- TestmodelFactory.eINSTANCE.createTestType())));
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
+ TestmodelFactory.eINSTANCE.createTestType())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
- TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
+ TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
- TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
+ TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
- TestmodelFactory.eINSTANCE.createTestType())));
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
+ TestmodelFactory.eINSTANCE.createTestType())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
- TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
+ TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
- newChildDescriptors.add
- (createChildParameter
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
- FeatureMapUtil.createEntry
- (TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
- TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
+ newChildDescriptors
+ .add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+ FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
+ TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
}
/**
@@ -270,25 +240,22 @@
* @generated
*/
@Override
- public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
- {
+ public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
Object childFeature = feature;
Object childObject = child;
if (childFeature instanceof EStructuralFeature
- && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature))
- {
+ && FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
final FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
childFeature = entry.getEStructuralFeature();
childObject = entry.getValue();
}
- final boolean qualify =
- childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY ||
- childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY;
+ final boolean qualify = childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY
+ ||
+ childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY;
- if (qualify)
- {
+ if (qualify) {
return getString("_UI_CreateChild_text2", //$NON-NLS-1$
new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
}
diff --git a/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.jdt.ui.prefs
index 8d55df1..8553926 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.jdt.ui.prefs
@@ -11,10 +11,12 @@
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
+cleanup.convert_functional_interfaces=false
cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=true
+cleanup.correct_indentation=false
cleanup.format_source_code=true
cleanup.format_source_code_changes_only=false
+cleanup.insert_inferred_type_arguments=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
@@ -29,6 +31,7 @@
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
+cleanup.remove_redundant_type_arguments=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -42,13 +45,16 @@
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
+cleanup.use_anonymous_class_creation=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
+cleanup.use_lambda=true
cleanup.use_parentheses_in_expressions=true
cleanup.use_this_for_non_static_field_access=true
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=true
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+cleanup.use_type_arguments=false
cleanup_profile=_esmCleanUp
cleanup_settings_version=2
eclipse.preferences.version=1
@@ -74,10 +80,12 @@
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
+sp_cleanup.convert_functional_interfaces=false
sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=true
+sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=true
sp_cleanup.format_source_code_changes_only=false
+sp_cleanup.insert_inferred_type_arguments=false
sp_cleanup.make_local_variable_final=true
sp_cleanup.make_parameters_final=false
sp_cleanup.make_private_fields_final=true
@@ -93,6 +101,7 @@
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
+sp_cleanup.remove_redundant_type_arguments=false
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
@@ -106,10 +115,13 @@
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
+sp_cleanup.use_anonymous_class_creation=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
+sp_cleanup.use_lambda=false
sp_cleanup.use_parentheses_in_expressions=true
sp_cleanup.use_this_for_non_static_field_access=true
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=true
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
+sp_cleanup.use_type_arguments=false
diff --git a/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.pde.ds.annotations.prefs b/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.pde.ds.annotations.prefs
new file mode 100644
index 0000000..5193d80
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.test.model/.settings/org.eclipse.pde.ds.annotations.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+enabled=true
+generateBundleActivationPolicyLazy=true
+path=OSGI-INF
+validationErrorLevel=error
+validationErrorLevel.missingImplicitUnbindMethod=warning
diff --git a/tests/org.eclipse.emf.emfstore.test.model/pom.xml b/tests/org.eclipse.emf.emfstore.test.model/pom.xml
index 8e5c0fc..f971ec8 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/pom.xml
+++ b/tests/org.eclipse.emf.emfstore.test.model/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.emfstore</groupId>
<artifactId>emfstore-tests-parent</artifactId>
- <version>1.8.1-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<relativePath>../../releng/org.eclipse.emf.emfstore.releng.tests</relativePath>
</parent>
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java
index aac9805..1892a10 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java
@@ -1,648 +1,652 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Test Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings <em>Strings</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap <em>Element Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap <em>String To String Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap <em>Element To String Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap <em>String To Element Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite <em>Contained Elements No
- * Opposite</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite <em>Contained Element No
- * Opposite</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}
- * </li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}
- * </li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement()
- * @model
- * @generated
- */
-public interface TestElement extends EObject {
- /**
- * Returns the value of the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Name</em>' attribute.
- * @see #setName(String)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Name()
- * @model annotation="http://www.eclipse.org/emf/2002/GenModel foo='bar'"
- * @generated
- */
- String getName();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Name</em>' attribute.
- * @see #getName()
- * @generated
- */
- void setName(String value);
-
- /**
- * Returns the value of the '<em><b>Strings</b></em>' attribute list.
- * The list contents are of type {@link java.lang.String}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Strings</em>' attribute list isn't clear, there really should be more of a description
- * here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Strings</em>' attribute list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Strings()
- * @model
- * @generated
- */
- EList<String> getStrings();
-
- /**
- * Returns the value of the '<em><b>References</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>References</em>' reference list isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>References</em>' reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_References()
- * @model
- * @generated
- */
- EList<TestElement> getReferences();
-
- /**
- * Returns the value of the '<em><b>Contained Elements</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer
- * <em>Container</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Contained Elements</em>' containment reference list isn't clear, there really should
- * be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Contained Elements</em>' containment reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer
- * @model opposite="container" containment="true"
- * @generated
- */
- EList<TestElement> getContainedElements();
-
- /**
- * Returns the value of the '<em><b>Reference</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Reference</em>' reference isn't clear, there really should be more of a description
- * here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Reference</em>' reference.
- * @see #setReference(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Reference()
- * @model
- * @generated
- */
- TestElement getReference();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}'
- * reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Reference</em>' reference.
- * @see #getReference()
- * @generated
- */
- void setReference(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Contained Element</b></em>' containment reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
- * <em>Sref Container</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Contained Element</em>' containment reference isn't clear, there really should be more
- * of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Contained Element</em>' containment reference.
- * @see #setContainedElement(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
- * @model opposite="srefContainer" containment="true"
- * @generated
- */
- TestElement getContainedElement();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement
- * <em>Contained Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Contained Element</em>' containment reference.
- * @see #getContainedElement()
- * @generated
- */
- void setContainedElement(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Other Reference</b></em>' reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Other Reference</em>' reference isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Other Reference</em>' reference.
- * @see #setOtherReference(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_OtherReference()
- * @model
- * @generated
- */
- TestElement getOtherReference();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference
- * <em>Other Reference</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Other Reference</em>' reference.
- * @see #getOtherReference()
- * @generated
- */
- void setOtherReference(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description
- * here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Description</em>' attribute.
- * @see #setDescription(String)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Description()
- * @model
- * @generated
- */
- String getDescription();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription
- * <em>Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Description</em>' attribute.
- * @see #getDescription()
- * @generated
- */
- void setDescription(String value);
-
- /**
- * Returns the value of the '<em><b>Container</b></em>' container reference.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Container</em>' container reference isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Container</em>' container reference.
- * @see #setContainer(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements
- * @model opposite="containedElements" transient="false"
- * @generated
- */
- TestElement getContainer();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'
- * container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Container</em>' container reference.
- * @see #getContainer()
- * @generated
- */
- void setContainer(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Sref Container</b></em>' container reference.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Sref Container</em>' container reference isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Sref Container</em>' container reference.
- * @see #setSrefContainer(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_SrefContainer()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement
- * @model opposite="containedElement" transient="false"
- * @generated
- */
- TestElement getSrefContainer();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
- * <em>Sref Container</em>}' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Sref Container</em>' container reference.
- * @see #getSrefContainer()
- * @generated
- */
- void setSrefContainer(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Element Map</b></em>' map.
- * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
- * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Element Map</em>' map isn't clear, there really should be more of a description
- * here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Element Map</em>' map.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementMap()
- * @model mapType=
- * "org.eclipse.emf.emfstore.test.model.TestElementToTestElementMap<org.eclipse.emf.emfstore.test.model.TestElement, org.eclipse.emf.emfstore.test.model.TestElement>"
- * @generated
- */
- EMap<TestElement, TestElement> getElementMap();
-
- /**
- * Returns the value of the '<em><b>String To String Map</b></em>' map.
- * The key is of type {@link java.lang.String},
- * and the value is of type {@link java.lang.String},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>String To String Map</em>' map isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>String To String Map</em>' map.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToStringMap()
- * @model mapType=
- * "org.eclipse.emf.emfstore.test.model.StringToStringMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
- * @generated
- */
- EMap<String, String> getStringToStringMap();
-
- /**
- * Returns the value of the '<em><b>Element To String Map</b></em>' map.
- * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
- * and the value is of type {@link java.lang.String},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Element To String Map</em>' map isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Element To String Map</em>' map.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementToStringMap()
- * @model mapType=
- * "org.eclipse.emf.emfstore.test.model.TestElementToStringMap<org.eclipse.emf.emfstore.test.model.TestElement, org.eclipse.emf.ecore.EString>"
- * @generated
- */
- EMap<TestElement, String> getElementToStringMap();
-
- /**
- * Returns the value of the '<em><b>String To Element Map</b></em>' map.
- * The key is of type {@link java.lang.String},
- * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>String To Element Map</em>' map isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>String To Element Map</em>' map.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToElementMap()
- * @model mapType=
- * "org.eclipse.emf.emfstore.test.model.StringToTestElementMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.emfstore.test.model.TestElement>"
- * @generated
- */
- EMap<String, TestElement> getStringToElementMap();
-
- /**
- * Returns the value of the '<em><b>Non Contained NTo1</b></em>' reference.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Non Contained NTo1</em>' reference isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Non Contained NTo1</em>' reference.
- * @see #setNonContained_NTo1(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NTo1()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN
- * @model opposite="nonContained_1ToN"
- * @generated
- */
- TestElement getNonContained_NTo1();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1
- * <em>Non Contained NTo1</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Non Contained NTo1</em>' reference.
- * @see #getNonContained_NTo1()
- * @generated
- */
- void setNonContained_NTo1(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Non Contained 1To N</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Non Contained 1To N</em>' reference list isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Non Contained 1To N</em>' reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_1ToN()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1
- * @model opposite="nonContained_NTo1"
- * @generated
- */
- EList<TestElement> getNonContained_1ToN();
-
- /**
- * Returns the value of the '<em><b>Non Contained NTo M</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Non Contained NTo M</em>' reference list isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Non Contained NTo M</em>' reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NToM()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN
- * @model opposite="nonContained_MToN"
- * @generated
- */
- EList<TestElement> getNonContained_NToM();
-
- /**
- * Returns the value of the '<em><b>Non Contained MTo N</b></em>' reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Non Contained MTo N</em>' reference list isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Non Contained MTo N</em>' reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_MToN()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM
- * @model opposite="nonContained_NToM"
- * @generated
- */
- EList<TestElement> getNonContained_MToN();
-
- /**
- * Returns the value of the '<em><b>Contained Elements2</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2
- * <em>Container2</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Contained Elements2</em>' containment reference list isn't clear, there really should
- * be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Contained Elements2</em>' containment reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements2()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2
- * @model opposite="container2" containment="true"
- * @generated
- */
- EList<TestElement> getContainedElements2();
-
- /**
- * Returns the value of the '<em><b>Container2</b></em>' container reference.
- * It is bidirectional and its opposite is '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Container2</em>' container reference isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Container2</em>' container reference.
- * @see #setContainer2(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container2()
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2
- * @model opposite="containedElements2" transient="false"
- * @generated
- */
- TestElement getContainer2();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'
- * container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Container2</em>' container reference.
- * @see #getContainer2()
- * @generated
- */
- void setContainer2(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Contained Elements No Opposite</em>' reference list isn't clear, there really should
- * be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Contained Elements No Opposite</em>' containment reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements_NoOpposite()
- * @model containment="true"
- * @generated
- */
- EList<TestElement> getContainedElements_NoOpposite();
-
- /**
- * Returns the value of the '<em><b>Contained Element No Opposite</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Contained Element No Opposite</em>' containment reference isn't clear, there really
- * should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Contained Element No Opposite</em>' containment reference.
- * @see #setContainedElement_NoOpposite(TestElement)
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement_NoOpposite()
- * @model containment="true"
- * @generated
- */
- TestElement getContainedElement_NoOpposite();
-
- /**
- * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
- * <em>Contained Element No Opposite</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param value the new value of the '<em>Contained Element No Opposite</em>' containment reference.
- * @see #getContainedElement_NoOpposite()
- * @generated
- */
- void setContainedElement_NoOpposite(TestElement value);
-
- /**
- * Returns the value of the '<em><b>Feature Map Entries</b></em>' attribute list.
- * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Feature Map Entries</em>' attribute list isn't clear, there really should be more of a
- * description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Feature Map Entries</em>' attribute list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapEntries()
- * @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
- * extendedMetaData="kind='group'"
- * @generated
- */
- FeatureMap getFeatureMapEntries();
-
- /**
- * Returns the value of the '<em><b>Feature Map References1</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Feature Map References1</em>' containment reference list isn't clear, there really
- * should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Feature Map References1</em>' containment reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences1()
- * @model containment="true" transient="true" volatile="true" derived="true"
- * extendedMetaData="group='#featureMapEntries'"
- * @generated
- */
- EList<TestElement> getFeatureMapReferences1();
-
- /**
- * Returns the value of the '<em><b>Feature Map References2</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Feature Map References2</em>' containment reference list isn't clear, there really
- * should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- *
- * @return the value of the '<em>Feature Map References2</em>' containment reference list.
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences2()
- * @model containment="true" transient="true" volatile="true" derived="true"
- * extendedMetaData="group='#featureMapEntries'"
- * @generated
- */
- EList<TestElement> getFeatureMapReferences2();
-
-} // TestElement
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.FeatureMap;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Test Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings <em>Strings</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap <em>Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap <em>String To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap <em>Element To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap <em>String To Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite
+ * <em>Contained Elements No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
+ * <em>Contained Element No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}
+ * </li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement()
+ * @model
+ * @generated
+ */
+public interface TestElement extends EObject {
+ /**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Name()
+ * @model annotation="http://www.eclipse.org/emf/2002/GenModel foo='bar'"
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
+ * Returns the value of the '<em><b>Strings</b></em>' attribute list.
+ * The list contents are of type {@link java.lang.String}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Strings</em>' attribute list isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Strings</em>' attribute list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Strings()
+ * @model
+ * @generated
+ */
+ EList<String> getStrings();
+
+ /**
+ * Returns the value of the '<em><b>References</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>References</em>' reference list isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>References</em>' reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_References()
+ * @model
+ * @generated
+ */
+ EList<TestElement> getReferences();
+
+ /**
+ * Returns the value of the '<em><b>Contained Elements</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer
+ * <em>Container</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contained Elements</em>' containment reference list isn't clear, there really should
+ * be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contained Elements</em>' containment reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer
+ * @model opposite="container" containment="true"
+ * @generated
+ */
+ EList<TestElement> getContainedElements();
+
+ /**
+ * Returns the value of the '<em><b>Reference</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Reference</em>' reference isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Reference</em>' reference.
+ * @see #setReference(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Reference()
+ * @model
+ * @generated
+ */
+ TestElement getReference();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}'
+ * reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Reference</em>' reference.
+ * @see #getReference()
+ * @generated
+ */
+ void setReference(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Contained Element</b></em>' containment reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
+ * <em>Sref Container</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contained Element</em>' containment reference isn't clear, there really should be more
+ * of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contained Element</em>' containment reference.
+ * @see #setContainedElement(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
+ * @model opposite="srefContainer" containment="true"
+ * @generated
+ */
+ TestElement getContainedElement();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement
+ * <em>Contained Element</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Contained Element</em>' containment reference.
+ * @see #getContainedElement()
+ * @generated
+ */
+ void setContainedElement(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Other Reference</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Other Reference</em>' reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Other Reference</em>' reference.
+ * @see #setOtherReference(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_OtherReference()
+ * @model
+ * @generated
+ */
+ TestElement getOtherReference();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference
+ * <em>Other Reference</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Other Reference</em>' reference.
+ * @see #getOtherReference()
+ * @generated
+ */
+ void setOtherReference(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Description</em>' attribute.
+ * @see #setDescription(String)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Description()
+ * @model
+ * @generated
+ */
+ String getDescription();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription <em>Description</em>
+ * }' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Description</em>' attribute.
+ * @see #getDescription()
+ * @generated
+ */
+ void setDescription(String value);
+
+ /**
+ * Returns the value of the '<em><b>Container</b></em>' container reference.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Container</em>' container reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Container</em>' container reference.
+ * @see #setContainer(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements
+ * @model opposite="containedElements" transient="false"
+ * @generated
+ */
+ TestElement getContainer();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'
+ * container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Container</em>' container reference.
+ * @see #getContainer()
+ * @generated
+ */
+ void setContainer(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Sref Container</b></em>' container reference.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Sref Container</em>' container reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Sref Container</em>' container reference.
+ * @see #setSrefContainer(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_SrefContainer()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement
+ * @model opposite="containedElement" transient="false"
+ * @generated
+ */
+ TestElement getSrefContainer();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
+ * <em>Sref Container</em>}' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Sref Container</em>' container reference.
+ * @see #getSrefContainer()
+ * @generated
+ */
+ void setSrefContainer(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Element Map</b></em>' map.
+ * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+ * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Element Map</em>' map isn't clear, there really should be more of a description
+ * here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Element Map</em>' map.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementMap()
+ * @model mapType=
+ * "org.eclipse.emf.emfstore.test.model.TestElementToTestElementMap<org.eclipse.emf.emfstore.test.model.TestElement,
+ * org.eclipse.emf.emfstore.test.model.TestElement>"
+ * @generated
+ */
+ EMap<TestElement, TestElement> getElementMap();
+
+ /**
+ * Returns the value of the '<em><b>String To String Map</b></em>' map.
+ * The key is of type {@link java.lang.String},
+ * and the value is of type {@link java.lang.String},
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>String To String Map</em>' map isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>String To String Map</em>' map.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToStringMap()
+ * @model mapType=
+ * "org.eclipse.emf.emfstore.test.model.StringToStringMap<org.eclipse.emf.ecore.EString,
+ * org.eclipse.emf.ecore.EString>"
+ * @generated
+ */
+ EMap<String, String> getStringToStringMap();
+
+ /**
+ * Returns the value of the '<em><b>Element To String Map</b></em>' map.
+ * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+ * and the value is of type {@link java.lang.String},
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Element To String Map</em>' map isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Element To String Map</em>' map.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementToStringMap()
+ * @model mapType=
+ * "org.eclipse.emf.emfstore.test.model.TestElementToStringMap<org.eclipse.emf.emfstore.test.model.TestElement,
+ * org.eclipse.emf.ecore.EString>"
+ * @generated
+ */
+ EMap<TestElement, String> getElementToStringMap();
+
+ /**
+ * Returns the value of the '<em><b>String To Element Map</b></em>' map.
+ * The key is of type {@link java.lang.String},
+ * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>String To Element Map</em>' map isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>String To Element Map</em>' map.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToElementMap()
+ * @model mapType=
+ * "org.eclipse.emf.emfstore.test.model.StringToTestElementMap<org.eclipse.emf.ecore.EString,
+ * org.eclipse.emf.emfstore.test.model.TestElement>"
+ * @generated
+ */
+ EMap<String, TestElement> getStringToElementMap();
+
+ /**
+ * Returns the value of the '<em><b>Non Contained NTo1</b></em>' reference.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Non Contained NTo1</em>' reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Non Contained NTo1</em>' reference.
+ * @see #setNonContained_NTo1(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NTo1()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN
+ * @model opposite="nonContained_1ToN"
+ * @generated
+ */
+ TestElement getNonContained_NTo1();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1
+ * <em>Non Contained NTo1</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Non Contained NTo1</em>' reference.
+ * @see #getNonContained_NTo1()
+ * @generated
+ */
+ void setNonContained_NTo1(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Non Contained 1To N</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Non Contained 1To N</em>' reference list isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Non Contained 1To N</em>' reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_1ToN()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1
+ * @model opposite="nonContained_NTo1"
+ * @generated
+ */
+ EList<TestElement> getNonContained_1ToN();
+
+ /**
+ * Returns the value of the '<em><b>Non Contained NTo M</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Non Contained NTo M</em>' reference list isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Non Contained NTo M</em>' reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NToM()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN
+ * @model opposite="nonContained_MToN"
+ * @generated
+ */
+ EList<TestElement> getNonContained_NToM();
+
+ /**
+ * Returns the value of the '<em><b>Non Contained MTo N</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Non Contained MTo N</em>' reference list isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Non Contained MTo N</em>' reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_MToN()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM
+ * @model opposite="nonContained_NToM"
+ * @generated
+ */
+ EList<TestElement> getNonContained_MToN();
+
+ /**
+ * Returns the value of the '<em><b>Contained Elements2</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2
+ * <em>Container2</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contained Elements2</em>' containment reference list isn't clear, there really should
+ * be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contained Elements2</em>' containment reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements2()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2
+ * @model opposite="container2" containment="true"
+ * @generated
+ */
+ EList<TestElement> getContainedElements2();
+
+ /**
+ * Returns the value of the '<em><b>Container2</b></em>' container reference.
+ * It is bidirectional and its opposite is '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Container2</em>' container reference isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Container2</em>' container reference.
+ * @see #setContainer2(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container2()
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2
+ * @model opposite="containedElements2" transient="false"
+ * @generated
+ */
+ TestElement getContainer2();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'
+ * container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Container2</em>' container reference.
+ * @see #getContainer2()
+ * @generated
+ */
+ void setContainer2(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contained Elements No Opposite</em>' reference list isn't clear, there really should
+ * be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contained Elements No Opposite</em>' containment reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements_NoOpposite()
+ * @model containment="true"
+ * @generated
+ */
+ EList<TestElement> getContainedElements_NoOpposite();
+
+ /**
+ * Returns the value of the '<em><b>Contained Element No Opposite</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Contained Element No Opposite</em>' containment reference isn't clear, there really
+ * should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Contained Element No Opposite</em>' containment reference.
+ * @see #setContainedElement_NoOpposite(TestElement)
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement_NoOpposite()
+ * @model containment="true"
+ * @generated
+ */
+ TestElement getContainedElement_NoOpposite();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
+ * <em>Contained Element No Opposite</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param value the new value of the '<em>Contained Element No Opposite</em>' containment reference.
+ * @see #getContainedElement_NoOpposite()
+ * @generated
+ */
+ void setContainedElement_NoOpposite(TestElement value);
+
+ /**
+ * Returns the value of the '<em><b>Feature Map Entries</b></em>' attribute list.
+ * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Feature Map Entries</em>' attribute list isn't clear, there really should be more of a
+ * description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Feature Map Entries</em>' attribute list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapEntries()
+ * @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
+ * extendedMetaData="kind='group'"
+ * @generated
+ */
+ FeatureMap getFeatureMapEntries();
+
+ /**
+ * Returns the value of the '<em><b>Feature Map References1</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Feature Map References1</em>' containment reference list isn't clear, there really
+ * should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Feature Map References1</em>' containment reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences1()
+ * @model containment="true" transient="true" volatile="true" derived="true"
+ * extendedMetaData="group='#featureMapEntries'"
+ * @generated
+ */
+ EList<TestElement> getFeatureMapReferences1();
+
+ /**
+ * Returns the value of the '<em><b>Feature Map References2</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Feature Map References2</em>' containment reference list isn't clear, there really
+ * should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Feature Map References2</em>' containment reference list.
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences2()
+ * @model containment="true" transient="true" volatile="true" derived="true"
+ * extendedMetaData="group='#featureMapEntries'"
+ * @generated
+ */
+ EList<TestElement> getFeatureMapReferences2();
+
+} // TestElement
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java
index cb26559..d3c7df8 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
*/
@@ -20,17 +20,16 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.test.model.TestType#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestType()
* @model
* @generated
*/
-public interface TestType extends EObject
-{
+public interface TestType extends EObject {
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -38,7 +37,7 @@
* If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Name</em>' attribute.
* @see #setName(String)
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestType_Name()
@@ -51,7 +50,7 @@
* Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestType#getName <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @param value the new value of the '<em>Name</em>' attribute.
* @see #getName()
* @generated
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java
index 3c87d43..e3fb332 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java
@@ -1,85 +1,85 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
- * @generated
- */
-public interface TestmodelFactory extends EFactory {
- /**
- * The singleton instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- TestmodelFactory eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelFactoryImpl.init();
-
- /**
- * Returns a new object of class '<em>Test Element</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Test Element</em>'.
- * @generated
- */
- TestElement createTestElement();
-
- /**
- * Returns a new object of class '<em>Test Type</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Test Type</em>'.
- * @generated
- */
- TestType createTestType();
-
- /**
- * Returns a new object of class '<em>Type With Feature Map Non Containment</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Type With Feature Map Non Containment</em>'.
- * @generated
- */
- TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment();
-
- /**
- * Returns a new object of class '<em>Type With Feature Map Containment</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return a new object of class '<em>Type With Feature Map Containment</em>'.
- * @generated
- */
- TypeWithFeatureMapContainment createTypeWithFeatureMapContainment();
-
- /**
- * Returns the package supported by this factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the package supported by this factory.
- * @generated
- */
- TestmodelPackage getTestmodelPackage();
-
-} // TestmodelFactory
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
+ * @generated
+ */
+public interface TestmodelFactory extends EFactory {
+ /**
+ * The singleton instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ TestmodelFactory eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelFactoryImpl.init();
+
+ /**
+ * Returns a new object of class '<em>Test Element</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Test Element</em>'.
+ * @generated
+ */
+ TestElement createTestElement();
+
+ /**
+ * Returns a new object of class '<em>Test Type</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Test Type</em>'.
+ * @generated
+ */
+ TestType createTestType();
+
+ /**
+ * Returns a new object of class '<em>Type With Feature Map Non Containment</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Type With Feature Map Non Containment</em>'.
+ * @generated
+ */
+ TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment();
+
+ /**
+ * Returns a new object of class '<em>Type With Feature Map Containment</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return a new object of class '<em>Type With Feature Map Containment</em>'.
+ * @generated
+ */
+ TypeWithFeatureMapContainment createTypeWithFeatureMapContainment();
+
+ /**
+ * Returns the package supported by this factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the package supported by this factory.
+ * @generated
+ */
+ TestmodelPackage getTestmodelPackage();
+
+} // TestmodelFactory
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java
index b73200c..25f337a 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java
@@ -1,1783 +1,1783 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.TestmodelFactory
- * @model kind="package"
- * @generated
- */
-public interface TestmodelPackage extends EPackage {
- /**
- * The package name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNAME = "test"; //$NON-NLS-1$
-
- /**
- * The package namespace URI.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_URI = "http://eclipse.org/emf/emfstore/test/model"; //$NON-NLS-1$
-
- /**
- * The package namespace name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- String eNS_PREFIX = "org.eclipse.emf.emfstore.test.model"; //$NON-NLS-1$
-
- /**
- * The singleton instance of the package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- TestmodelPackage eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl.init();
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
- * <em>Test Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()
- * @generated
- */
- int TEST_ELEMENT = 0;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__NAME = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>Strings</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__STRINGS = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>References</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__REFERENCES = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
-
- /**
- * The feature id for the '<em><b>Contained Elements</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINED_ELEMENTS = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
-
- /**
- * The feature id for the '<em><b>Reference</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
-
- /**
- * The feature id for the '<em><b>Contained Element</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINED_ELEMENT = EcorePackage.EOBJECT_FEATURE_COUNT + 5;
-
- /**
- * The feature id for the '<em><b>Other Reference</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__OTHER_REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 6;
-
- /**
- * The feature id for the '<em><b>Description</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__DESCRIPTION = EcorePackage.EOBJECT_FEATURE_COUNT + 7;
-
- /**
- * The feature id for the '<em><b>Container</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 8;
-
- /**
- * The feature id for the '<em><b>Sref Container</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__SREF_CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 9;
-
- /**
- * The feature id for the '<em><b>Element Map</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 10;
-
- /**
- * The feature id for the '<em><b>String To String Map</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__STRING_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 11;
-
- /**
- * The feature id for the '<em><b>Element To String Map</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__ELEMENT_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 12;
-
- /**
- * The feature id for the '<em><b>String To Element Map</b></em>' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__STRING_TO_ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 13;
-
- /**
- * The feature id for the '<em><b>Non Contained NTo1</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__NON_CONTAINED_NTO1 = EcorePackage.EOBJECT_FEATURE_COUNT + 14;
-
- /**
- * The feature id for the '<em><b>Non Contained 1To N</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__NON_CONTAINED_1TO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 15;
-
- /**
- * The feature id for the '<em><b>Non Contained NTo M</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__NON_CONTAINED_NTO_M = EcorePackage.EOBJECT_FEATURE_COUNT + 16;
-
- /**
- * The feature id for the '<em><b>Non Contained MTo N</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__NON_CONTAINED_MTO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 17;
-
- /**
- * The feature id for the '<em><b>Contained Elements2</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINED_ELEMENTS2 = EcorePackage.EOBJECT_FEATURE_COUNT + 18;
-
- /**
- * The feature id for the '<em><b>Container2</b></em>' container reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINER2 = EcorePackage.EOBJECT_FEATURE_COUNT + 19;
-
- /**
- * The feature id for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 20;
-
- /**
- * The feature id for the '<em><b>Contained Element No Opposite</b></em>' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 21;
-
- /**
- * The feature id for the '<em><b>Feature Map Entries</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__FEATURE_MAP_ENTRIES = EcorePackage.EOBJECT_FEATURE_COUNT + 22;
-
- /**
- * The feature id for the '<em><b>Feature Map References1</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = EcorePackage.EOBJECT_FEATURE_COUNT + 23;
-
- /**
- * The feature id for the '<em><b>Feature Map References2</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = EcorePackage.EOBJECT_FEATURE_COUNT + 24;
-
- /**
- * The number of structural features of the '<em>Test Element</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 25;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
- * <em>Test Element To String Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()
- * @generated
- */
- int TEST_ELEMENT_TO_STRING_MAP = 1;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_TO_STRING_MAP__VALUE = 0;
-
- /**
- * The feature id for the '<em><b>Key</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_TO_STRING_MAP__KEY = 1;
-
- /**
- * The number of structural features of the '<em>Test Element To String Map</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_TO_STRING_MAP_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
- * <em>String To String Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()
- * @generated
- */
- int STRING_TO_STRING_MAP = 2;
-
- /**
- * The feature id for the '<em><b>Key</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int STRING_TO_STRING_MAP__KEY = 0;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int STRING_TO_STRING_MAP__VALUE = 1;
-
- /**
- * The number of structural features of the '<em>String To String Map</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int STRING_TO_STRING_MAP_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
- * <em>Test Element To Test Element Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()
- * @generated
- */
- int TEST_ELEMENT_TO_TEST_ELEMENT_MAP = 3;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = 0;
-
- /**
- * The feature id for the '<em><b>Key</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = 1;
-
- /**
- * The number of structural features of the '<em>Test Element To Test Element Map</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_ELEMENT_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
- * <em>String To Test Element Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()
- * @generated
- */
- int STRING_TO_TEST_ELEMENT_MAP = 4;
-
- /**
- * The feature id for the '<em><b>Value</b></em>' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int STRING_TO_TEST_ELEMENT_MAP__VALUE = 0;
-
- /**
- * The feature id for the '<em><b>Key</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int STRING_TO_TEST_ELEMENT_MAP__KEY = 1;
-
- /**
- * The number of structural features of the '<em>String To Test Element Map</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int STRING_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl <em>Test Type</em>}'
- * class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()
- * @generated
- */
- int TEST_TYPE = 5;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_TYPE__NAME = 0;
-
- /**
- * The number of structural features of the '<em>Test Type</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TEST_TYPE_FEATURE_COUNT = 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
- * <em>Type With Feature Map Non Containment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()
- * @generated
- */
- int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = 6;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__NAME = TEST_TYPE__NAME;
-
- /**
- * The feature id for the '<em><b>Map</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = TEST_TYPE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>First Key</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = TEST_TYPE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Second Key</b></em>' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = TEST_TYPE_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Type With Feature Map Non Containment</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;
-
- /**
- * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
- * <em>Type With Feature Map Containment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()
- * @generated
- */
- int TYPE_WITH_FEATURE_MAP_CONTAINMENT = 7;
-
- /**
- * The feature id for the '<em><b>Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_CONTAINMENT__NAME = TEST_TYPE__NAME;
-
- /**
- * The feature id for the '<em><b>Map Containment</b></em>' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 0;
-
- /**
- * The feature id for the '<em><b>First Key Containment</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 1;
-
- /**
- * The feature id for the '<em><b>Second Key Containment</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 2;
-
- /**
- * The number of structural features of the '<em>Type With Feature Map Containment</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- * @ordered
- */
- int TYPE_WITH_FEATURE_MAP_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestElement <em>Test Element</em>}
- * '.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Test Element</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement
- * @generated
- */
- EClass getTestElement();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName
- * <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getName()
- * @see #getTestElement()
- * @generated
- */
- EAttribute getTestElement_Name();
-
- /**
- * Returns the meta object for the attribute list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings <em>Strings</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute list '<em>Strings</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getStrings()
- * @see #getTestElement()
- * @generated
- */
- EAttribute getTestElement_Strings();
-
- /**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>References</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getReferences()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_References();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Contained Elements</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ContainedElements();
-
- /**
- * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference
- * <em>Reference</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Reference</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getReference()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_Reference();
-
- /**
- * Returns the meta object for the containment reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference '<em>Contained Element</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ContainedElement();
-
- /**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Other Reference</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_OtherReference();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription
- * <em>Description</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Description</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getDescription()
- * @see #getTestElement()
- * @generated
- */
- EAttribute getTestElement_Description();
-
- /**
- * Returns the meta object for the container reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Container</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_Container();
-
- /**
- * Returns the meta object for the container reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Sref Container</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_SrefContainer();
-
- /**
- * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap
- * <em>Element Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the map '<em>Element Map</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementMap()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ElementMap();
-
- /**
- * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap
- * <em>String To String Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the map '<em>String To String Map</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_StringToStringMap();
-
- /**
- * Returns the meta object for the map '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap <em>Element To String Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the map '<em>Element To String Map</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ElementToStringMap();
-
- /**
- * Returns the meta object for the map '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap <em>String To Element Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the map '<em>String To Element Map</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_StringToElementMap();
-
- /**
- * Returns the meta object for the reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Non Contained NTo1</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_NonContained_NTo1();
-
- /**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Non Contained 1To N</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_NonContained_1ToN();
-
- /**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Non Contained NTo M</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_NonContained_NToM();
-
- /**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Non Contained MTo N</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_NonContained_MToN();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Contained Elements2</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ContainedElements2();
-
- /**
- * Returns the meta object for the container reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the container reference '<em>Container2</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_Container2();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite
- * <em>Contained Elements No Opposite</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Contained Elements No Opposite</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ContainedElements_NoOpposite();
-
- /**
- * Returns the meta object for the containment reference '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
- * <em>Contained Element No Opposite</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference '<em>Contained Element No Opposite</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_ContainedElement_NoOpposite();
-
- /**
- * Returns the meta object for the attribute list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute list '<em>Feature Map Entries</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries()
- * @see #getTestElement()
- * @generated
- */
- EAttribute getTestElement_FeatureMapEntries();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}
- * '.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Feature Map References1</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_FeatureMapReferences1();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}
- * '.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Feature Map References2</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2()
- * @see #getTestElement()
- * @generated
- */
- EReference getTestElement_FeatureMapReferences2();
-
- /**
- * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Test Element To String Map</em>'.
- * @see java.util.Map.Entry
- * @model features="value key"
- * valueDataType="org.eclipse.emf.ecore.EString"
- * keyType="org.eclipse.emf.emfstore.test.model.TestElement"
- * @generated
- */
- EClass getTestElementToStringMap();
-
- /**
- * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see java.util.Map.Entry
- * @see #getTestElementToStringMap()
- * @generated
- */
- EAttribute getTestElementToStringMap_Value();
-
- /**
- * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Key</em>'.
- * @see java.util.Map.Entry
- * @see #getTestElementToStringMap()
- * @generated
- */
- EReference getTestElementToStringMap_Key();
-
- /**
- * Returns the meta object for class '{@link java.util.Map.Entry <em>String To String Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>String To String Map</em>'.
- * @see java.util.Map.Entry
- * @model keyDataType="org.eclipse.emf.ecore.EString"
- * valueDataType="org.eclipse.emf.ecore.EString"
- * @generated
- */
- EClass getStringToStringMap();
-
- /**
- * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Key</em>'.
- * @see java.util.Map.Entry
- * @see #getStringToStringMap()
- * @generated
- */
- EAttribute getStringToStringMap_Key();
-
- /**
- * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Value</em>'.
- * @see java.util.Map.Entry
- * @see #getStringToStringMap()
- * @generated
- */
- EAttribute getStringToStringMap_Value();
-
- /**
- * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To Test Element Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Test Element To Test Element Map</em>'.
- * @see java.util.Map.Entry
- * @model features="value key"
- * valueType="org.eclipse.emf.emfstore.test.model.TestElement"
- * keyType="org.eclipse.emf.emfstore.test.model.TestElement"
- * @generated
- */
- EClass getTestElementToTestElementMap();
-
- /**
- * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Value</em>'.
- * @see java.util.Map.Entry
- * @see #getTestElementToTestElementMap()
- * @generated
- */
- EReference getTestElementToTestElementMap_Value();
-
- /**
- * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Key</em>'.
- * @see java.util.Map.Entry
- * @see #getTestElementToTestElementMap()
- * @generated
- */
- EReference getTestElementToTestElementMap_Key();
-
- /**
- * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>String To Test Element Map</em>'.
- * @see java.util.Map.Entry
- * @model features="value key"
- * valueType="org.eclipse.emf.emfstore.test.model.TestElement"
- * keyDataType="org.eclipse.emf.ecore.EString"
- * @generated
- */
- EClass getStringToTestElementMap();
-
- /**
- * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference '<em>Value</em>'.
- * @see java.util.Map.Entry
- * @see #getStringToTestElementMap()
- * @generated
- */
- EReference getStringToTestElementMap_Value();
-
- /**
- * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Key</em>'.
- * @see java.util.Map.Entry
- * @see #getStringToTestElementMap()
- * @generated
- */
- EAttribute getStringToTestElementMap_Key();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestType <em>Test Type</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Test Type</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestType
- * @generated
- */
- EClass getTestType();
-
- /**
- * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestType#getName
- * <em>Name</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute '<em>Name</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TestType#getName()
- * @see #getTestType()
- * @generated
- */
- EAttribute getTestType_Name();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
- * <em>Type With Feature Map Non Containment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Type With Feature Map Non Containment</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
- * @generated
- */
- EClass getTypeWithFeatureMapNonContainment();
-
- /**
- * Returns the meta object for the attribute list '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap <em>Map</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute list '<em>Map</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap()
- * @see #getTypeWithFeatureMapNonContainment()
- * @generated
- */
- EAttribute getTypeWithFeatureMapNonContainment_Map();
-
- /**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey <em>First Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>First Key</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey()
- * @see #getTypeWithFeatureMapNonContainment()
- * @generated
- */
- EReference getTypeWithFeatureMapNonContainment_FirstKey();
-
- /**
- * Returns the meta object for the reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the reference list '<em>Second Key</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey()
- * @see #getTypeWithFeatureMapNonContainment()
- * @generated
- */
- EReference getTypeWithFeatureMapNonContainment_SecondKey();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
- * <em>Type With Feature Map Containment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for class '<em>Type With Feature Map Containment</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
- * @generated
- */
- EClass getTypeWithFeatureMapContainment();
-
- /**
- * Returns the meta object for the attribute list '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment
- * <em>Map Containment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the attribute list '<em>Map Containment</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment()
- * @see #getTypeWithFeatureMapContainment()
- * @generated
- */
- EAttribute getTypeWithFeatureMapContainment_MapContainment();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment
- * <em>First Key Containment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>First Key Containment</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment()
- * @see #getTypeWithFeatureMapContainment()
- * @generated
- */
- EReference getTypeWithFeatureMapContainment_FirstKeyContainment();
-
- /**
- * Returns the meta object for the containment reference list '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment
- * <em>Second Key Containment</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the meta object for the containment reference list '<em>Second Key Containment</em>'.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment()
- * @see #getTypeWithFeatureMapContainment()
- * @generated
- */
- EReference getTypeWithFeatureMapContainment_SecondKeyContainment();
-
- /**
- * Returns the factory that creates the instances of the model.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the factory that creates the instances of the model.
- * @generated
- */
- TestmodelFactory getTestmodelFactory();
-
- /**
- * <!-- begin-user-doc -->
- * Defines literals for the meta objects that represent
- * <ul>
- * <li>each class,</li>
- * <li>each feature of each class,</li>
- * <li>each enum,</li>
- * <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- *
- * @generated
- */
- interface Literals {
- /**
- * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
- * <em>Test Element</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()
- * @generated
- */
- EClass TEST_ELEMENT = eINSTANCE.getTestElement();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TEST_ELEMENT__NAME = eINSTANCE.getTestElement_Name();
-
- /**
- * The meta object literal for the '<em><b>Strings</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TEST_ELEMENT__STRINGS = eINSTANCE.getTestElement_Strings();
-
- /**
- * The meta object literal for the '<em><b>References</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__REFERENCES = eINSTANCE.getTestElement_References();
-
- /**
- * The meta object literal for the '<em><b>Contained Elements</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINED_ELEMENTS = eINSTANCE.getTestElement_ContainedElements();
-
- /**
- * The meta object literal for the '<em><b>Reference</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__REFERENCE = eINSTANCE.getTestElement_Reference();
-
- /**
- * The meta object literal for the '<em><b>Contained Element</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINED_ELEMENT = eINSTANCE.getTestElement_ContainedElement();
-
- /**
- * The meta object literal for the '<em><b>Other Reference</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__OTHER_REFERENCE = eINSTANCE.getTestElement_OtherReference();
-
- /**
- * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TEST_ELEMENT__DESCRIPTION = eINSTANCE.getTestElement_Description();
-
- /**
- * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINER = eINSTANCE.getTestElement_Container();
-
- /**
- * The meta object literal for the '<em><b>Sref Container</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__SREF_CONTAINER = eINSTANCE.getTestElement_SrefContainer();
-
- /**
- * The meta object literal for the '<em><b>Element Map</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__ELEMENT_MAP = eINSTANCE.getTestElement_ElementMap();
-
- /**
- * The meta object literal for the '<em><b>String To String Map</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__STRING_TO_STRING_MAP = eINSTANCE.getTestElement_StringToStringMap();
-
- /**
- * The meta object literal for the '<em><b>Element To String Map</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElement_ElementToStringMap();
-
- /**
- * The meta object literal for the '<em><b>String To Element Map</b></em>' map feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__STRING_TO_ELEMENT_MAP = eINSTANCE.getTestElement_StringToElementMap();
-
- /**
- * The meta object literal for the '<em><b>Non Contained NTo1</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__NON_CONTAINED_NTO1 = eINSTANCE.getTestElement_NonContained_NTo1();
-
- /**
- * The meta object literal for the '<em><b>Non Contained 1To N</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__NON_CONTAINED_1TO_N = eINSTANCE.getTestElement_NonContained_1ToN();
-
- /**
- * The meta object literal for the '<em><b>Non Contained NTo M</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__NON_CONTAINED_NTO_M = eINSTANCE.getTestElement_NonContained_NToM();
-
- /**
- * The meta object literal for the '<em><b>Non Contained MTo N</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__NON_CONTAINED_MTO_N = eINSTANCE.getTestElement_NonContained_MToN();
-
- /**
- * The meta object literal for the '<em><b>Contained Elements2</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINED_ELEMENTS2 = eINSTANCE.getTestElement_ContainedElements2();
-
- /**
- * The meta object literal for the '<em><b>Container2</b></em>' container reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINER2 = eINSTANCE.getTestElement_Container2();
-
- /**
- * The meta object literal for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list
- * feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = eINSTANCE
- .getTestElement_ContainedElements_NoOpposite();
-
- /**
- * The meta object literal for the '<em><b>Contained Element No Opposite</b></em>' containment reference
- * feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getTestElement_ContainedElement_NoOpposite();
-
- /**
- * The meta object literal for the '<em><b>Feature Map Entries</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TEST_ELEMENT__FEATURE_MAP_ENTRIES = eINSTANCE.getTestElement_FeatureMapEntries();
-
- /**
- * The meta object literal for the '<em><b>Feature Map References1</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = eINSTANCE.getTestElement_FeatureMapReferences1();
-
- /**
- * The meta object literal for the '<em><b>Feature Map References2</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = eINSTANCE.getTestElement_FeatureMapReferences2();
-
- /**
- * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
- * <em>Test Element To String Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()
- * @generated
- */
- EClass TEST_ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElementToStringMap();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TEST_ELEMENT_TO_STRING_MAP__VALUE = eINSTANCE.getTestElementToStringMap_Value();
-
- /**
- * The meta object literal for the '<em><b>Key</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT_TO_STRING_MAP__KEY = eINSTANCE.getTestElementToStringMap_Key();
-
- /**
- * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
- * <em>String To String Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()
- * @generated
- */
- EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap();
-
- /**
- * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value();
-
- /**
- * The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
- * <em>Test Element To Test Element Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()
- * @generated
- */
- EClass TEST_ELEMENT_TO_TEST_ELEMENT_MAP = eINSTANCE.getTestElementToTestElementMap();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getTestElementToTestElementMap_Value();
-
- /**
- * The meta object literal for the '<em><b>Key</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getTestElementToTestElementMap_Key();
-
- /**
- * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
- * <em>String To Test Element Map</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()
- * @generated
- */
- EClass STRING_TO_TEST_ELEMENT_MAP = eINSTANCE.getStringToTestElementMap();
-
- /**
- * The meta object literal for the '<em><b>Value</b></em>' reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference STRING_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getStringToTestElementMap_Value();
-
- /**
- * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute STRING_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getStringToTestElementMap_Key();
-
- /**
- * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
- * <em>Test Type</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()
- * @generated
- */
- EClass TEST_TYPE = eINSTANCE.getTestType();
-
- /**
- * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TEST_TYPE__NAME = eINSTANCE.getTestType_Name();
-
- /**
- * The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
- * <em>Type With Feature Map Non Containment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()
- * @generated
- */
- EClass TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapNonContainment();
-
- /**
- * The meta object literal for the '<em><b>Map</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = eINSTANCE.getTypeWithFeatureMapNonContainment_Map();
-
- /**
- * The meta object literal for the '<em><b>First Key</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = eINSTANCE
- .getTypeWithFeatureMapNonContainment_FirstKey();
-
- /**
- * The meta object literal for the '<em><b>Second Key</b></em>' reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = eINSTANCE
- .getTypeWithFeatureMapNonContainment_SecondKey();
-
- /**
- * The meta object literal for the '
- * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
- * <em>Type With Feature Map Containment</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
- * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()
- * @generated
- */
- EClass TYPE_WITH_FEATURE_MAP_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapContainment();
-
- /**
- * The meta object literal for the '<em><b>Map Containment</b></em>' attribute list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EAttribute TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = eINSTANCE
- .getTypeWithFeatureMapContainment_MapContainment();
-
- /**
- * The meta object literal for the '<em><b>First Key Containment</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = eINSTANCE
- .getTypeWithFeatureMapContainment_FirstKeyContainment();
-
- /**
- * The meta object literal for the '<em><b>Second Key Containment</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = eINSTANCE
- .getTypeWithFeatureMapContainment_SecondKeyContainment();
-
- }
-
-} // TestmodelPackage
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface TestmodelPackage extends EPackage {
+ /**
+ * The package name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNAME = "test"; //$NON-NLS-1$
+
+ /**
+ * The package namespace URI.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_URI = "http://eclipse.org/emf/emfstore/test/model"; //$NON-NLS-1$
+
+ /**
+ * The package namespace name.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ String eNS_PREFIX = "org.eclipse.emf.emfstore.test.model"; //$NON-NLS-1$
+
+ /**
+ * The singleton instance of the package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ TestmodelPackage eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl.init();
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl <em>Test Element</em>
+ * }' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()
+ * @generated
+ */
+ int TEST_ELEMENT = 0;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__NAME = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Strings</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__STRINGS = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>References</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__REFERENCES = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+
+ /**
+ * The feature id for the '<em><b>Contained Elements</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINED_ELEMENTS = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
+
+ /**
+ * The feature id for the '<em><b>Reference</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
+
+ /**
+ * The feature id for the '<em><b>Contained Element</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINED_ELEMENT = EcorePackage.EOBJECT_FEATURE_COUNT + 5;
+
+ /**
+ * The feature id for the '<em><b>Other Reference</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__OTHER_REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 6;
+
+ /**
+ * The feature id for the '<em><b>Description</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__DESCRIPTION = EcorePackage.EOBJECT_FEATURE_COUNT + 7;
+
+ /**
+ * The feature id for the '<em><b>Container</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 8;
+
+ /**
+ * The feature id for the '<em><b>Sref Container</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__SREF_CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 9;
+
+ /**
+ * The feature id for the '<em><b>Element Map</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 10;
+
+ /**
+ * The feature id for the '<em><b>String To String Map</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__STRING_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 11;
+
+ /**
+ * The feature id for the '<em><b>Element To String Map</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__ELEMENT_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 12;
+
+ /**
+ * The feature id for the '<em><b>String To Element Map</b></em>' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__STRING_TO_ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 13;
+
+ /**
+ * The feature id for the '<em><b>Non Contained NTo1</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__NON_CONTAINED_NTO1 = EcorePackage.EOBJECT_FEATURE_COUNT + 14;
+
+ /**
+ * The feature id for the '<em><b>Non Contained 1To N</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__NON_CONTAINED_1TO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 15;
+
+ /**
+ * The feature id for the '<em><b>Non Contained NTo M</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__NON_CONTAINED_NTO_M = EcorePackage.EOBJECT_FEATURE_COUNT + 16;
+
+ /**
+ * The feature id for the '<em><b>Non Contained MTo N</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__NON_CONTAINED_MTO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 17;
+
+ /**
+ * The feature id for the '<em><b>Contained Elements2</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINED_ELEMENTS2 = EcorePackage.EOBJECT_FEATURE_COUNT + 18;
+
+ /**
+ * The feature id for the '<em><b>Container2</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINER2 = EcorePackage.EOBJECT_FEATURE_COUNT + 19;
+
+ /**
+ * The feature id for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 20;
+
+ /**
+ * The feature id for the '<em><b>Contained Element No Opposite</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 21;
+
+ /**
+ * The feature id for the '<em><b>Feature Map Entries</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__FEATURE_MAP_ENTRIES = EcorePackage.EOBJECT_FEATURE_COUNT + 22;
+
+ /**
+ * The feature id for the '<em><b>Feature Map References1</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = EcorePackage.EOBJECT_FEATURE_COUNT + 23;
+
+ /**
+ * The feature id for the '<em><b>Feature Map References2</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = EcorePackage.EOBJECT_FEATURE_COUNT + 24;
+
+ /**
+ * The number of structural features of the '<em>Test Element</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 25;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+ * <em>Test Element To String Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()
+ * @generated
+ */
+ int TEST_ELEMENT_TO_STRING_MAP = 1;
+
+ /**
+ * The feature id for the '<em><b>Value</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_TO_STRING_MAP__VALUE = 0;
+
+ /**
+ * The feature id for the '<em><b>Key</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_TO_STRING_MAP__KEY = 1;
+
+ /**
+ * The number of structural features of the '<em>Test Element To String Map</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+ * <em>String To String Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()
+ * @generated
+ */
+ int STRING_TO_STRING_MAP = 2;
+
+ /**
+ * The feature id for the '<em><b>Key</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int STRING_TO_STRING_MAP__KEY = 0;
+
+ /**
+ * The feature id for the '<em><b>Value</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int STRING_TO_STRING_MAP__VALUE = 1;
+
+ /**
+ * The number of structural features of the '<em>String To String Map</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int STRING_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+ * <em>Test Element To Test Element Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()
+ * @generated
+ */
+ int TEST_ELEMENT_TO_TEST_ELEMENT_MAP = 3;
+
+ /**
+ * The feature id for the '<em><b>Value</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = 0;
+
+ /**
+ * The feature id for the '<em><b>Key</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = 1;
+
+ /**
+ * The number of structural features of the '<em>Test Element To Test Element Map</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_ELEMENT_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+ * <em>String To Test Element Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()
+ * @generated
+ */
+ int STRING_TO_TEST_ELEMENT_MAP = 4;
+
+ /**
+ * The feature id for the '<em><b>Value</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int STRING_TO_TEST_ELEMENT_MAP__VALUE = 0;
+
+ /**
+ * The feature id for the '<em><b>Key</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int STRING_TO_TEST_ELEMENT_MAP__KEY = 1;
+
+ /**
+ * The number of structural features of the '<em>String To Test Element Map</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int STRING_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl <em>Test Type</em>}'
+ * class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()
+ * @generated
+ */
+ int TEST_TYPE = 5;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_TYPE__NAME = 0;
+
+ /**
+ * The number of structural features of the '<em>Test Type</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TEST_TYPE_FEATURE_COUNT = 1;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+ * <em>Type With Feature Map Non Containment</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()
+ * @generated
+ */
+ int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = 6;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__NAME = TEST_TYPE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Map</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = TEST_TYPE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>First Key</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = TEST_TYPE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Second Key</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = TEST_TYPE_FEATURE_COUNT + 2;
+
+ /**
+ * The number of structural features of the '<em>Type With Feature Map Non Containment</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;
+
+ /**
+ * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+ * <em>Type With Feature Map Containment</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()
+ * @generated
+ */
+ int TYPE_WITH_FEATURE_MAP_CONTAINMENT = 7;
+
+ /**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_CONTAINMENT__NAME = TEST_TYPE__NAME;
+
+ /**
+ * The feature id for the '<em><b>Map Containment</b></em>' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>First Key Containment</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 1;
+
+ /**
+ * The feature id for the '<em><b>Second Key Containment</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 2;
+
+ /**
+ * The number of structural features of the '<em>Type With Feature Map Containment</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ * @ordered
+ */
+ int TYPE_WITH_FEATURE_MAP_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestElement <em>Test Element</em>}
+ * '.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Test Element</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement
+ * @generated
+ */
+ EClass getTestElement();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName
+ * <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getName()
+ * @see #getTestElement()
+ * @generated
+ */
+ EAttribute getTestElement_Name();
+
+ /**
+ * Returns the meta object for the attribute list '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings
+ * <em>Strings</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute list '<em>Strings</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getStrings()
+ * @see #getTestElement()
+ * @generated
+ */
+ EAttribute getTestElement_Strings();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>References</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getReferences()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_References();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Contained Elements</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ContainedElements();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference
+ * <em>Reference</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Reference</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getReference()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_Reference();
+
+ /**
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference '<em>Contained Element</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ContainedElement();
+
+ /**
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Other Reference</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_OtherReference();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription
+ * <em>Description</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Description</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getDescription()
+ * @see #getTestElement()
+ * @generated
+ */
+ EAttribute getTestElement_Description();
+
+ /**
+ * Returns the meta object for the container reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the container reference '<em>Container</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_Container();
+
+ /**
+ * Returns the meta object for the container reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the container reference '<em>Sref Container</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_SrefContainer();
+
+ /**
+ * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap
+ * <em>Element Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the map '<em>Element Map</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementMap()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ElementMap();
+
+ /**
+ * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap
+ * <em>String To String Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the map '<em>String To String Map</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_StringToStringMap();
+
+ /**
+ * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap
+ * <em>Element To String Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the map '<em>Element To String Map</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ElementToStringMap();
+
+ /**
+ * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap
+ * <em>String To Element Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the map '<em>String To Element Map</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_StringToElementMap();
+
+ /**
+ * Returns the meta object for the reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Non Contained NTo1</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_NonContained_NTo1();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>Non Contained 1To N</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_NonContained_1ToN();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>Non Contained NTo M</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_NonContained_NToM();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>Non Contained MTo N</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_NonContained_MToN();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Contained Elements2</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ContainedElements2();
+
+ /**
+ * Returns the meta object for the container reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the container reference '<em>Container2</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_Container2();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite
+ * <em>Contained Elements No Opposite</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Contained Elements No Opposite</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ContainedElements_NoOpposite();
+
+ /**
+ * Returns the meta object for the containment reference '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
+ * <em>Contained Element No Opposite</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference '<em>Contained Element No Opposite</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_ContainedElement_NoOpposite();
+
+ /**
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute list '<em>Feature Map Entries</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries()
+ * @see #getTestElement()
+ * @generated
+ */
+ EAttribute getTestElement_FeatureMapEntries();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}
+ * '.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Feature Map References1</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_FeatureMapReferences1();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}
+ * '.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Feature Map References2</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2()
+ * @see #getTestElement()
+ * @generated
+ */
+ EReference getTestElement_FeatureMapReferences2();
+
+ /**
+ * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Test Element To String Map</em>'.
+ * @see java.util.Map.Entry
+ * @model features="value key"
+ * valueDataType="org.eclipse.emf.ecore.EString"
+ * keyType="org.eclipse.emf.emfstore.test.model.TestElement"
+ * @generated
+ */
+ EClass getTestElementToStringMap();
+
+ /**
+ * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Value</em>'.
+ * @see java.util.Map.Entry
+ * @see #getTestElementToStringMap()
+ * @generated
+ */
+ EAttribute getTestElementToStringMap_Value();
+
+ /**
+ * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Key</em>'.
+ * @see java.util.Map.Entry
+ * @see #getTestElementToStringMap()
+ * @generated
+ */
+ EReference getTestElementToStringMap_Key();
+
+ /**
+ * Returns the meta object for class '{@link java.util.Map.Entry <em>String To String Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>String To String Map</em>'.
+ * @see java.util.Map.Entry
+ * @model keyDataType="org.eclipse.emf.ecore.EString"
+ * valueDataType="org.eclipse.emf.ecore.EString"
+ * @generated
+ */
+ EClass getStringToStringMap();
+
+ /**
+ * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Key</em>'.
+ * @see java.util.Map.Entry
+ * @see #getStringToStringMap()
+ * @generated
+ */
+ EAttribute getStringToStringMap_Key();
+
+ /**
+ * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Value</em>'.
+ * @see java.util.Map.Entry
+ * @see #getStringToStringMap()
+ * @generated
+ */
+ EAttribute getStringToStringMap_Value();
+
+ /**
+ * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To Test Element Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Test Element To Test Element Map</em>'.
+ * @see java.util.Map.Entry
+ * @model features="value key"
+ * valueType="org.eclipse.emf.emfstore.test.model.TestElement"
+ * keyType="org.eclipse.emf.emfstore.test.model.TestElement"
+ * @generated
+ */
+ EClass getTestElementToTestElementMap();
+
+ /**
+ * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Value</em>'.
+ * @see java.util.Map.Entry
+ * @see #getTestElementToTestElementMap()
+ * @generated
+ */
+ EReference getTestElementToTestElementMap_Value();
+
+ /**
+ * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Key</em>'.
+ * @see java.util.Map.Entry
+ * @see #getTestElementToTestElementMap()
+ * @generated
+ */
+ EReference getTestElementToTestElementMap_Key();
+
+ /**
+ * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>String To Test Element Map</em>'.
+ * @see java.util.Map.Entry
+ * @model features="value key"
+ * valueType="org.eclipse.emf.emfstore.test.model.TestElement"
+ * keyDataType="org.eclipse.emf.ecore.EString"
+ * @generated
+ */
+ EClass getStringToTestElementMap();
+
+ /**
+ * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference '<em>Value</em>'.
+ * @see java.util.Map.Entry
+ * @see #getStringToTestElementMap()
+ * @generated
+ */
+ EReference getStringToTestElementMap_Value();
+
+ /**
+ * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Key</em>'.
+ * @see java.util.Map.Entry
+ * @see #getStringToTestElementMap()
+ * @generated
+ */
+ EAttribute getStringToTestElementMap_Key();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestType <em>Test Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Test Type</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestType
+ * @generated
+ */
+ EClass getTestType();
+
+ /**
+ * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestType#getName
+ * <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TestType#getName()
+ * @see #getTestType()
+ * @generated
+ */
+ EAttribute getTestType_Name();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+ * <em>Type With Feature Map Non Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Type With Feature Map Non Containment</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+ * @generated
+ */
+ EClass getTypeWithFeatureMapNonContainment();
+
+ /**
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap <em>Map</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute list '<em>Map</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap()
+ * @see #getTypeWithFeatureMapNonContainment()
+ * @generated
+ */
+ EAttribute getTypeWithFeatureMapNonContainment_Map();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey <em>First Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>First Key</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey()
+ * @see #getTypeWithFeatureMapNonContainment()
+ * @generated
+ */
+ EReference getTypeWithFeatureMapNonContainment_FirstKey();
+
+ /**
+ * Returns the meta object for the reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the reference list '<em>Second Key</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey()
+ * @see #getTypeWithFeatureMapNonContainment()
+ * @generated
+ */
+ EReference getTypeWithFeatureMapNonContainment_SecondKey();
+
+ /**
+ * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+ * <em>Type With Feature Map Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for class '<em>Type With Feature Map Containment</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+ * @generated
+ */
+ EClass getTypeWithFeatureMapContainment();
+
+ /**
+ * Returns the meta object for the attribute list '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment
+ * <em>Map Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the attribute list '<em>Map Containment</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment()
+ * @see #getTypeWithFeatureMapContainment()
+ * @generated
+ */
+ EAttribute getTypeWithFeatureMapContainment_MapContainment();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment
+ * <em>First Key Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>First Key Containment</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment()
+ * @see #getTypeWithFeatureMapContainment()
+ * @generated
+ */
+ EReference getTypeWithFeatureMapContainment_FirstKeyContainment();
+
+ /**
+ * Returns the meta object for the containment reference list '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment
+ * <em>Second Key Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the meta object for the containment reference list '<em>Second Key Containment</em>'.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment()
+ * @see #getTypeWithFeatureMapContainment()
+ * @generated
+ */
+ EReference getTypeWithFeatureMapContainment_SecondKeyContainment();
+
+ /**
+ * Returns the factory that creates the instances of the model.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the factory that creates the instances of the model.
+ * @generated
+ */
+ TestmodelFactory getTestmodelFactory();
+
+ /**
+ * <!-- begin-user-doc -->
+ * Defines literals for the meta objects that represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ interface Literals {
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
+ * <em>Test Element</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()
+ * @generated
+ */
+ EClass TEST_ELEMENT = eINSTANCE.getTestElement();
+
+ /**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TEST_ELEMENT__NAME = eINSTANCE.getTestElement_Name();
+
+ /**
+ * The meta object literal for the '<em><b>Strings</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TEST_ELEMENT__STRINGS = eINSTANCE.getTestElement_Strings();
+
+ /**
+ * The meta object literal for the '<em><b>References</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__REFERENCES = eINSTANCE.getTestElement_References();
+
+ /**
+ * The meta object literal for the '<em><b>Contained Elements</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINED_ELEMENTS = eINSTANCE.getTestElement_ContainedElements();
+
+ /**
+ * The meta object literal for the '<em><b>Reference</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__REFERENCE = eINSTANCE.getTestElement_Reference();
+
+ /**
+ * The meta object literal for the '<em><b>Contained Element</b></em>' containment reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINED_ELEMENT = eINSTANCE.getTestElement_ContainedElement();
+
+ /**
+ * The meta object literal for the '<em><b>Other Reference</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__OTHER_REFERENCE = eINSTANCE.getTestElement_OtherReference();
+
+ /**
+ * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TEST_ELEMENT__DESCRIPTION = eINSTANCE.getTestElement_Description();
+
+ /**
+ * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINER = eINSTANCE.getTestElement_Container();
+
+ /**
+ * The meta object literal for the '<em><b>Sref Container</b></em>' container reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__SREF_CONTAINER = eINSTANCE.getTestElement_SrefContainer();
+
+ /**
+ * The meta object literal for the '<em><b>Element Map</b></em>' map feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__ELEMENT_MAP = eINSTANCE.getTestElement_ElementMap();
+
+ /**
+ * The meta object literal for the '<em><b>String To String Map</b></em>' map feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__STRING_TO_STRING_MAP = eINSTANCE.getTestElement_StringToStringMap();
+
+ /**
+ * The meta object literal for the '<em><b>Element To String Map</b></em>' map feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElement_ElementToStringMap();
+
+ /**
+ * The meta object literal for the '<em><b>String To Element Map</b></em>' map feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__STRING_TO_ELEMENT_MAP = eINSTANCE.getTestElement_StringToElementMap();
+
+ /**
+ * The meta object literal for the '<em><b>Non Contained NTo1</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__NON_CONTAINED_NTO1 = eINSTANCE.getTestElement_NonContained_NTo1();
+
+ /**
+ * The meta object literal for the '<em><b>Non Contained 1To N</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__NON_CONTAINED_1TO_N = eINSTANCE.getTestElement_NonContained_1ToN();
+
+ /**
+ * The meta object literal for the '<em><b>Non Contained NTo M</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__NON_CONTAINED_NTO_M = eINSTANCE.getTestElement_NonContained_NToM();
+
+ /**
+ * The meta object literal for the '<em><b>Non Contained MTo N</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__NON_CONTAINED_MTO_N = eINSTANCE.getTestElement_NonContained_MToN();
+
+ /**
+ * The meta object literal for the '<em><b>Contained Elements2</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINED_ELEMENTS2 = eINSTANCE.getTestElement_ContainedElements2();
+
+ /**
+ * The meta object literal for the '<em><b>Container2</b></em>' container reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINER2 = eINSTANCE.getTestElement_Container2();
+
+ /**
+ * The meta object literal for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list
+ * feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = eINSTANCE
+ .getTestElement_ContainedElements_NoOpposite();
+
+ /**
+ * The meta object literal for the '<em><b>Contained Element No Opposite</b></em>' containment reference
+ * feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getTestElement_ContainedElement_NoOpposite();
+
+ /**
+ * The meta object literal for the '<em><b>Feature Map Entries</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TEST_ELEMENT__FEATURE_MAP_ENTRIES = eINSTANCE.getTestElement_FeatureMapEntries();
+
+ /**
+ * The meta object literal for the '<em><b>Feature Map References1</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = eINSTANCE.getTestElement_FeatureMapReferences1();
+
+ /**
+ * The meta object literal for the '<em><b>Feature Map References2</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = eINSTANCE.getTestElement_FeatureMapReferences2();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+ * <em>Test Element To String Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()
+ * @generated
+ */
+ EClass TEST_ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElementToStringMap();
+
+ /**
+ * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TEST_ELEMENT_TO_STRING_MAP__VALUE = eINSTANCE.getTestElementToStringMap_Value();
+
+ /**
+ * The meta object literal for the '<em><b>Key</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT_TO_STRING_MAP__KEY = eINSTANCE.getTestElementToStringMap_Key();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+ * <em>String To String Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()
+ * @generated
+ */
+ EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap();
+
+ /**
+ * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key();
+
+ /**
+ * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value();
+
+ /**
+ * The meta object literal for the '
+ * {@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+ * <em>Test Element To Test Element Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()
+ * @generated
+ */
+ EClass TEST_ELEMENT_TO_TEST_ELEMENT_MAP = eINSTANCE.getTestElementToTestElementMap();
+
+ /**
+ * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getTestElementToTestElementMap_Value();
+
+ /**
+ * The meta object literal for the '<em><b>Key</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getTestElementToTestElementMap_Key();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+ * <em>String To Test Element Map</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()
+ * @generated
+ */
+ EClass STRING_TO_TEST_ELEMENT_MAP = eINSTANCE.getStringToTestElementMap();
+
+ /**
+ * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference STRING_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getStringToTestElementMap_Value();
+
+ /**
+ * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute STRING_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getStringToTestElementMap_Key();
+
+ /**
+ * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
+ * <em>Test Type</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()
+ * @generated
+ */
+ EClass TEST_TYPE = eINSTANCE.getTestType();
+
+ /**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TEST_TYPE__NAME = eINSTANCE.getTestType_Name();
+
+ /**
+ * The meta object literal for the '
+ * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+ * <em>Type With Feature Map Non Containment</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()
+ * @generated
+ */
+ EClass TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapNonContainment();
+
+ /**
+ * The meta object literal for the '<em><b>Map</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = eINSTANCE.getTypeWithFeatureMapNonContainment_Map();
+
+ /**
+ * The meta object literal for the '<em><b>First Key</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = eINSTANCE
+ .getTypeWithFeatureMapNonContainment_FirstKey();
+
+ /**
+ * The meta object literal for the '<em><b>Second Key</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = eINSTANCE
+ .getTypeWithFeatureMapNonContainment_SecondKey();
+
+ /**
+ * The meta object literal for the '
+ * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+ * <em>Type With Feature Map Containment</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+ * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()
+ * @generated
+ */
+ EClass TYPE_WITH_FEATURE_MAP_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapContainment();
+
+ /**
+ * The meta object literal for the '<em><b>Map Containment</b></em>' attribute list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EAttribute TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = eINSTANCE
+ .getTypeWithFeatureMapContainment_MapContainment();
+
+ /**
+ * The meta object literal for the '<em><b>First Key Containment</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = eINSTANCE
+ .getTypeWithFeatureMapContainment_FirstKeyContainment();
+
+ /**
+ * The meta object literal for the '<em><b>Second Key Containment</b></em>' containment reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = eINSTANCE
+ .getTypeWithFeatureMapContainment_SecondKeyContainment();
+
+ }
+
+} // TestmodelPackage
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java
index 74d960e..a881474 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
*/
@@ -21,22 +21,21 @@
*
* <p>
* The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment <em>Map Containment
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment <em>First Key
- * Containment</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment <em>Second Key
- * Containment</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment
+ * <em>Map Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment
+ * <em>First Key Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment
+ * <em>Second Key Containment</em>}</li>
+ * </ul>
*
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapContainment()
* @model
* @generated
*/
-public interface TypeWithFeatureMapContainment extends TestType
-{
+public interface TypeWithFeatureMapContainment extends TestType {
/**
* Returns the value of the '<em><b>Map Containment</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
@@ -46,7 +45,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Map Containment</em>' attribute list.
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapContainment_MapContainment()
* @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -64,7 +63,7 @@
* should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>First Key Containment</em>' containment reference list.
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapContainment_FirstKeyContainment()
* @model containment="true" transient="true" volatile="true"
@@ -82,7 +81,7 @@
* should be more of a description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Second Key Containment</em>' containment reference list.
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapContainment_SecondKeyContainment()
* @model containment="true" transient="true" volatile="true"
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java
index 869af2c..f8ee2ae 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
*/
@@ -21,19 +21,19 @@
*
* <p>
* The following features are supported:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap <em>Map</em>}</li>
* <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey <em>First Key</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}
+ * </li>
* </ul>
- * </p>
*
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapNonContainment()
* @model
* @generated
*/
-public interface TypeWithFeatureMapNonContainment extends TestType
-{
+public interface TypeWithFeatureMapNonContainment extends TestType {
/**
* Returns the value of the '<em><b>Map</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
@@ -43,7 +43,7 @@
* here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Map</em>' attribute list.
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapNonContainment_Map()
* @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
@@ -61,7 +61,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>First Key</em>' reference list.
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapNonContainment_FirstKey()
* @model transient="true" volatile="true" derived="true"
@@ -79,7 +79,7 @@
* description here...
* </p>
* <!-- end-user-doc -->
- *
+ *
* @return the value of the '<em>Second Key</em>' reference list.
* @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapNonContainment_SecondKey()
* @model transient="true" volatile="true" derived="true"
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java
index 45286e5..4fd6f14 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java
@@ -1,334 +1,332 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String To String Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedKey <em>Key</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<String, String> {
- /**
- * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected static final String KEY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected String key = KEY_EDEFAULT;
-
- /**
- * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected StringToStringMapImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return TestmodelPackage.Literals.STRING_TO_STRING_MAP;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getTypedKey() {
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedKey(String newKey) {
- String oldKey = key;
- key = newKey;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__KEY, oldKey,
- key));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getTypedValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedValue(String newValue) {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__VALUE,
- oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
- return getTypedKey();
- case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
- return getTypedValue();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
- setTypedKey((String) newValue);
- return;
- case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
- setTypedValue((String) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
- setTypedKey(KEY_EDEFAULT);
- return;
- case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
- setTypedValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
- return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
- case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (key: "); //$NON-NLS-1$
- result.append(key);
- result.append(", value: "); //$NON-NLS-1$
- result.append(value);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected int hash = -1;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public int getHash() {
- if (hash == -1)
- {
- Object theKey = getKey();
- hash = (theKey == null ? 0 : theKey.hashCode());
- }
- return hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setHash(int hash) {
- this.hash = hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getKey() {
- return getTypedKey();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setKey(String key) {
- setTypedKey(key);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getValue() {
- return getTypedValue();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String setValue(String value) {
- String oldValue = getValue();
- setTypedValue(value);
- return oldValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- public EMap<String, String> getEMap() {
- EObject container = eContainer();
- return container == null ? null : (EMap<String, String>) container.eGet(eContainmentFeature());
- }
-
-} // StringToStringMapImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String To String Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<String, String> {
+ /**
+ * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedKey()
+ * @generated
+ * @ordered
+ */
+ protected static final String KEY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedKey()
+ * @generated
+ * @ordered
+ */
+ protected String key = KEY_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedValue()
+ * @generated
+ * @ordered
+ */
+ protected static final String VALUE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedValue()
+ * @generated
+ * @ordered
+ */
+ protected String value = VALUE_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected StringToStringMapImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return TestmodelPackage.Literals.STRING_TO_STRING_MAP;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getTypedKey() {
+ return key;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedKey(String newKey) {
+ final String oldKey = key;
+ key = newKey;
+ if (eNotificationRequired()) {
+ eNotify(
+ new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__KEY, oldKey, key));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getTypedValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedValue(String newValue) {
+ final String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__VALUE,
+ oldValue, value));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+ return getTypedKey();
+ case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+ return getTypedValue();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+ setTypedKey((String) newValue);
+ return;
+ case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+ setTypedValue((String) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+ setTypedKey(KEY_EDEFAULT);
+ return;
+ case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+ setTypedValue(VALUE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+ return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+ case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) {
+ return super.toString();
+ }
+
+ final StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (key: "); //$NON-NLS-1$
+ result.append(key);
+ result.append(", value: "); //$NON-NLS-1$
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected int hash = -1;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public int getHash() {
+ if (hash == -1) {
+ final Object theKey = getKey();
+ hash = theKey == null ? 0 : theKey.hashCode();
+ }
+ return hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setHash(int hash) {
+ this.hash = hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getKey() {
+ return getTypedKey();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setKey(String key) {
+ setTypedKey(key);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getValue() {
+ return getTypedValue();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String setValue(String value) {
+ final String oldValue = getValue();
+ setTypedValue(value);
+ return oldValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ public EMap<String, String> getEMap() {
+ final EObject container = eContainer();
+ return container == null ? null : (EMap<String, String>) container.eGet(eContainmentFeature());
+ }
+
+} // StringToStringMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java
index 393396b..41c29b8 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java
@@ -1,346 +1,344 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>String To Test Element Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedKey <em>Key</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StringToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<String, TestElement> {
- /**
- * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected TestElement value;
-
- /**
- * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected static final String KEY_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected String key = KEY_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected StringToTestElementMapImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getTypedValue() {
- if (value != null && value.eIsProxy())
- {
- InternalEObject oldValue = (InternalEObject) value;
- value = (TestElement) eResolveProxy(oldValue);
- if (value != oldValue)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
- }
- }
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetTypedValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedValue(TestElement newValue) {
- TestElement oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE,
- oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getTypedKey() {
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedKey(String newKey) {
- String oldKey = key;
- key = newKey;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY,
- oldKey, key));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
- if (resolve)
- return getTypedValue();
- return basicGetTypedValue();
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
- return getTypedKey();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
- setTypedValue((TestElement) newValue);
- return;
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
- setTypedKey((String) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
- setTypedValue((TestElement) null);
- return;
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
- setTypedKey(KEY_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
- return value != null;
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
- return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (key: "); //$NON-NLS-1$
- result.append(key);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected int hash = -1;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public int getHash() {
- if (hash == -1)
- {
- Object theKey = getKey();
- hash = (theKey == null ? 0 : theKey.hashCode());
- }
- return hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setHash(int hash) {
- this.hash = hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getKey() {
- return getTypedKey();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setKey(String key) {
- setTypedKey(key);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getValue() {
- return getTypedValue();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement setValue(TestElement value) {
- TestElement oldValue = getValue();
- setTypedValue(value);
- return oldValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- public EMap<String, TestElement> getEMap() {
- EObject container = eContainer();
- return container == null ? null : (EMap<String, TestElement>) container.eGet(eContainmentFeature());
- }
-
-} // StringToTestElementMapImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String To Test Element Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedKey <em>Key</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<String, TestElement> {
+ /**
+ * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedValue()
+ * @generated
+ * @ordered
+ */
+ protected TestElement value;
+
+ /**
+ * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedKey()
+ * @generated
+ * @ordered
+ */
+ protected static final String KEY_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedKey()
+ * @generated
+ * @ordered
+ */
+ protected String key = KEY_EDEFAULT;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected StringToTestElementMapImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getTypedValue() {
+ if (value != null && value.eIsProxy()) {
+ final InternalEObject oldValue = (InternalEObject) value;
+ value = (TestElement) eResolveProxy(oldValue);
+ if (value != oldValue) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
+ }
+ }
+ }
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetTypedValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedValue(TestElement newValue) {
+ final TestElement oldValue = value;
+ value = newValue;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE,
+ oldValue, value));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getTypedKey() {
+ return key;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedKey(String newKey) {
+ final String oldKey = key;
+ key = newKey;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY,
+ oldKey, key));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+ if (resolve) {
+ return getTypedValue();
+ }
+ return basicGetTypedValue();
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+ return getTypedKey();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+ setTypedValue((TestElement) newValue);
+ return;
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+ setTypedKey((String) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+ setTypedValue((TestElement) null);
+ return;
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+ setTypedKey(KEY_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+ return value != null;
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+ return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) {
+ return super.toString();
+ }
+
+ final StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (key: "); //$NON-NLS-1$
+ result.append(key);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected int hash = -1;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public int getHash() {
+ if (hash == -1) {
+ final Object theKey = getKey();
+ hash = theKey == null ? 0 : theKey.hashCode();
+ }
+ return hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setHash(int hash) {
+ this.hash = hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getKey() {
+ return getTypedKey();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setKey(String key) {
+ setTypedKey(key);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getValue() {
+ return getTypedValue();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement setValue(TestElement value) {
+ final TestElement oldValue = getValue();
+ setTypedValue(value);
+ return oldValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ public EMap<String, TestElement> getEMap() {
+ final EObject container = eContainer();
+ return container == null ? null : (EMap<String, TestElement>) container.eGet(eContainmentFeature());
+ }
+
+} // StringToTestElementMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java
index 60f20ec..3894767 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java
@@ -1,1600 +1,1554 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreEMap;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Test Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStrings <em>Strings</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReferences <em>References</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements <em>Contained Elements</em>}
- * </li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReference <em>Reference</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement <em>Contained Element</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getOtherReference <em>Other Reference</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getDescription <em>Description</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer <em>Container</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getSrefContainer <em>Sref Container</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementMap <em>Element Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToStringMap <em>String To String Map
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementToStringMap <em>Element To String Map
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToElementMap <em>String To Element Map
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NTo1 <em>Non Contained NTo1</em>}
- * </li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_1ToN <em>Non Contained 1To N
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NToM <em>Non Contained NTo M
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_MToN <em>Non Contained MTo N
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements2 <em>Contained Elements2
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer2 <em>Container2</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements_NoOpposite <em>Contained
- * Elements No Opposite</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement_NoOpposite <em>Contained
- * Element No Opposite</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapEntries <em>Feature Map Entries
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences1 <em>Feature Map
- * References1</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences2 <em>Feature Map
- * References2</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TestElementImpl extends EObjectImpl implements TestElement {
- /**
- * The default value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected static final String NAME_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getName()
- * @generated
- * @ordered
- */
- protected String name = NAME_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getStrings() <em>Strings</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getStrings()
- * @generated
- * @ordered
- */
- protected EList<String> strings;
-
- /**
- * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getReferences()
- * @generated
- * @ordered
- */
- protected EList<TestElement> references;
-
- /**
- * The cached value of the '{@link #getContainedElements() <em>Contained Elements</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getContainedElements()
- * @generated
- * @ordered
- */
- protected EList<TestElement> containedElements;
-
- /**
- * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getReference()
- * @generated
- * @ordered
- */
- protected TestElement reference;
-
- /**
- * The cached value of the '{@link #getContainedElement() <em>Contained Element</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getContainedElement()
- * @generated
- * @ordered
- */
- protected TestElement containedElement;
-
- /**
- * The cached value of the '{@link #getOtherReference() <em>Other Reference</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getOtherReference()
- * @generated
- * @ordered
- */
- protected TestElement otherReference;
-
- /**
- * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getDescription()
- * @generated
- * @ordered
- */
- protected static final String DESCRIPTION_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getDescription()
- * @generated
- * @ordered
- */
- protected String description = DESCRIPTION_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getElementMap() <em>Element Map</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getElementMap()
- * @generated
- * @ordered
- */
- protected EMap<TestElement, TestElement> elementMap;
-
- /**
- * The cached value of the '{@link #getStringToStringMap() <em>String To String Map</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getStringToStringMap()
- * @generated
- * @ordered
- */
- protected EMap<String, String> stringToStringMap;
-
- /**
- * The cached value of the '{@link #getElementToStringMap() <em>Element To String Map</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getElementToStringMap()
- * @generated
- * @ordered
- */
- protected EMap<TestElement, String> elementToStringMap;
-
- /**
- * The cached value of the '{@link #getStringToElementMap() <em>String To Element Map</em>}' map.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getStringToElementMap()
- * @generated
- * @ordered
- */
- protected EMap<String, TestElement> stringToElementMap;
-
- /**
- * The cached value of the '{@link #getNonContained_NTo1() <em>Non Contained NTo1</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getNonContained_NTo1()
- * @generated
- * @ordered
- */
- protected TestElement nonContained_NTo1;
-
- /**
- * The cached value of the '{@link #getNonContained_1ToN() <em>Non Contained 1To N</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getNonContained_1ToN()
- * @generated
- * @ordered
- */
- protected EList<TestElement> nonContained_1ToN;
-
- /**
- * The cached value of the '{@link #getNonContained_NToM() <em>Non Contained NTo M</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getNonContained_NToM()
- * @generated
- * @ordered
- */
- protected EList<TestElement> nonContained_NToM;
-
- /**
- * The cached value of the '{@link #getNonContained_MToN() <em>Non Contained MTo N</em>}' reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getNonContained_MToN()
- * @generated
- * @ordered
- */
- protected EList<TestElement> nonContained_MToN;
-
- /**
- * The cached value of the '{@link #getContainedElements2() <em>Contained Elements2</em>}' containment reference
- * list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getContainedElements2()
- * @generated
- * @ordered
- */
- protected EList<TestElement> containedElements2;
-
- /**
- * The cached value of the '{@link #getContainedElements_NoOpposite() <em>Contained Elements No Opposite</em>}'
- * containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getContainedElements_NoOpposite()
- * @generated
- * @ordered
- */
- protected EList<TestElement> containedElements_NoOpposite;
-
- /**
- * The cached value of the '{@link #getContainedElement_NoOpposite() <em>Contained Element No Opposite</em>}'
- * containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getContainedElement_NoOpposite()
- * @generated
- * @ordered
- */
- protected TestElement containedElement_NoOpposite;
-
- /**
- * The cached value of the '{@link #getFeatureMapEntries() <em>Feature Map Entries</em>}' attribute list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getFeatureMapEntries()
- * @generated
- * @ordered
- */
- protected FeatureMap featureMapEntries;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected TestElementImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return TestmodelPackage.Literals.TEST_ELEMENT;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getName() {
- return name;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setName(String newName) {
- final String oldName = name;
- name = newName;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NAME, oldName, name));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<String> getStrings() {
- if (strings == null)
- {
- strings = new EDataTypeUniqueEList<String>(String.class, this, TestmodelPackage.TEST_ELEMENT__STRINGS);
- }
- return strings;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getReferences() {
- if (references == null)
- {
- references = new EObjectResolvingEList<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__REFERENCES);
- }
- return references;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getContainedElements() {
- if (containedElements == null)
- {
- containedElements = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestmodelPackage.TEST_ELEMENT__CONTAINER);
- }
- return containedElements;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getReference() {
- if (reference != null && reference.eIsProxy())
- {
- final InternalEObject oldReference = (InternalEObject) reference;
- reference = (TestElement) eResolveProxy(oldReference);
- if (reference != oldReference)
- {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE, TestmodelPackage.TEST_ELEMENT__REFERENCE,
- oldReference, reference));
- }
- }
- }
- return reference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetReference() {
- return reference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setReference(TestElement newReference) {
- final TestElement oldReference = reference;
- reference = newReference;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__REFERENCE,
- oldReference, reference));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getContainedElement() {
- return containedElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetContainedElement(TestElement newContainedElement, NotificationChain msgs) {
- final TestElement oldContainedElement = containedElement;
- containedElement = newContainedElement;
- if (eNotificationRequired())
- {
- final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, oldContainedElement, newContainedElement);
- if (msgs == null) {
- msgs = notification;
- } else {
- msgs.add(notification);
- }
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setContainedElement(TestElement newContainedElement) {
- if (newContainedElement != containedElement)
- {
- NotificationChain msgs = null;
- if (containedElement != null) {
- msgs = ((InternalEObject) containedElement).eInverseRemove(this,
- TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);
- }
- if (newContainedElement != null) {
- msgs = ((InternalEObject) newContainedElement).eInverseAdd(this,
- TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);
- }
- msgs = basicSetContainedElement(newContainedElement, msgs);
- if (msgs != null) {
- msgs.dispatch();
- }
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,
- newContainedElement, newContainedElement));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getOtherReference() {
- if (otherReference != null && otherReference.eIsProxy())
- {
- final InternalEObject oldOtherReference = (InternalEObject) otherReference;
- otherReference = (TestElement) eResolveProxy(oldOtherReference);
- if (otherReference != oldOtherReference)
- {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE, oldOtherReference, otherReference));
- }
- }
- }
- return otherReference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetOtherReference() {
- return otherReference;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setOtherReference(TestElement newOtherReference) {
- final TestElement oldOtherReference = otherReference;
- otherReference = newOtherReference;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE,
- oldOtherReference, otherReference));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setDescription(String newDescription) {
- final String oldDescription = description;
- description = newDescription;
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__DESCRIPTION,
- oldDescription, description));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getContainer() {
- if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER) {
- return null;
- }
- return (TestElement) eInternalContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetContainer(TestElement newContainer, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject) newContainer, TestmodelPackage.TEST_ELEMENT__CONTAINER, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setContainer(TestElement newContainer) {
- if (newContainer != eInternalContainer()
- || eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER && newContainer != null)
- {
- if (EcoreUtil.isAncestor(this, newContainer))
- {
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
- }
- NotificationChain msgs = null;
- if (eInternalContainer() != null) {
- msgs = eBasicRemoveFromContainer(msgs);
- }
- if (newContainer != null) {
- msgs = ((InternalEObject) newContainer).eInverseAdd(this,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestElement.class, msgs);
- }
- msgs = basicSetContainer(newContainer, msgs);
- if (msgs != null) {
- msgs.dispatch();
- }
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER,
- newContainer, newContainer));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getSrefContainer() {
- if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER) {
- return null;
- }
- return (TestElement) eInternalContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetSrefContainer(TestElement newSrefContainer, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject) newSrefContainer, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,
- msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setSrefContainer(TestElement newSrefContainer) {
- if (newSrefContainer != eInternalContainer()
- || eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER && newSrefContainer != null)
- {
- if (EcoreUtil.isAncestor(this, newSrefContainer))
- {
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
- }
- NotificationChain msgs = null;
- if (eInternalContainer() != null) {
- msgs = eBasicRemoveFromContainer(msgs);
- }
- if (newSrefContainer != null) {
- msgs = ((InternalEObject) newSrefContainer).eInverseAdd(this,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, TestElement.class, msgs);
- }
- msgs = basicSetSrefContainer(newSrefContainer, msgs);
- if (msgs != null) {
- msgs.dispatch();
- }
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,
- newSrefContainer, newSrefContainer));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EMap<TestElement, TestElement> getElementMap() {
- if (elementMap == null)
- {
- elementMap = new EcoreEMap<TestElement, TestElement>(
- TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP, TestElementToTestElementMapImpl.class,
- this, TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP);
- }
- return elementMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EMap<String, String> getStringToStringMap() {
- if (stringToStringMap == null)
- {
- stringToStringMap = new EcoreEMap<String, String>(TestmodelPackage.Literals.STRING_TO_STRING_MAP,
- StringToStringMapImpl.class, this, TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP);
- }
- return stringToStringMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EMap<TestElement, String> getElementToStringMap() {
- if (elementToStringMap == null)
- {
- elementToStringMap = new EcoreEMap<TestElement, String>(
- TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP, TestElementToStringMapImpl.class, this,
- TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP);
- }
- return elementToStringMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EMap<String, TestElement> getStringToElementMap() {
- if (stringToElementMap == null)
- {
- stringToElementMap = new EcoreEMap<String, TestElement>(
- TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP, StringToTestElementMapImpl.class, this,
- TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP);
- }
- return stringToElementMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getNonContained_NTo1() {
- if (nonContained_NTo1 != null && nonContained_NTo1.eIsProxy())
- {
- final InternalEObject oldNonContained_NTo1 = (InternalEObject) nonContained_NTo1;
- nonContained_NTo1 = (TestElement) eResolveProxy(oldNonContained_NTo1);
- if (nonContained_NTo1 != oldNonContained_NTo1)
- {
- if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, nonContained_NTo1));
- }
- }
- }
- return nonContained_NTo1;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetNonContained_NTo1() {
- return nonContained_NTo1;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetNonContained_NTo1(TestElement newNonContained_NTo1, NotificationChain msgs) {
- final TestElement oldNonContained_NTo1 = nonContained_NTo1;
- nonContained_NTo1 = newNonContained_NTo1;
- if (eNotificationRequired())
- {
- final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, newNonContained_NTo1);
- if (msgs == null) {
- msgs = notification;
- } else {
- msgs.add(notification);
- }
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setNonContained_NTo1(TestElement newNonContained_NTo1) {
- if (newNonContained_NTo1 != nonContained_NTo1)
- {
- NotificationChain msgs = null;
- if (nonContained_NTo1 != null) {
- msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
- }
- if (newNonContained_NTo1 != null) {
- msgs = ((InternalEObject) newNonContained_NTo1).eInverseAdd(this,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
- }
- msgs = basicSetNonContained_NTo1(newNonContained_NTo1, msgs);
- if (msgs != null) {
- msgs.dispatch();
- }
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1,
- newNonContained_NTo1, newNonContained_NTo1));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getNonContained_1ToN() {
- if (nonContained_1ToN == null)
- {
- nonContained_1ToN = new EObjectWithInverseResolvingEList<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1);
- }
- return nonContained_1ToN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getNonContained_NToM() {
- if (nonContained_NToM == null)
- {
- nonContained_NToM = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N);
- }
- return nonContained_NToM;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getNonContained_MToN() {
- if (nonContained_MToN == null)
- {
- nonContained_MToN = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M);
- }
- return nonContained_MToN;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getContainedElements2() {
- if (containedElements2 == null)
- {
- containedElements2 = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestmodelPackage.TEST_ELEMENT__CONTAINER2);
- }
- return containedElements2;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getContainer2() {
- if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2) {
- return null;
- }
- return (TestElement) eInternalContainer();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetContainer2(TestElement newContainer2, NotificationChain msgs) {
- msgs = eBasicSetContainer((InternalEObject) newContainer2, TestmodelPackage.TEST_ELEMENT__CONTAINER2, msgs);
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setContainer2(TestElement newContainer2) {
- if (newContainer2 != eInternalContainer()
- || eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2 && newContainer2 != null)
- {
- if (EcoreUtil.isAncestor(this, newContainer2))
- {
- throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
- }
- NotificationChain msgs = null;
- if (eInternalContainer() != null) {
- msgs = eBasicRemoveFromContainer(msgs);
- }
- if (newContainer2 != null) {
- msgs = ((InternalEObject) newContainer2).eInverseAdd(this,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestElement.class, msgs);
- }
- msgs = basicSetContainer2(newContainer2, msgs);
- if (msgs != null) {
- msgs.dispatch();
- }
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER2,
- newContainer2, newContainer2));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getContainedElements_NoOpposite()
- {
- if (containedElements_NoOpposite == null)
- {
- containedElements_NoOpposite = new EObjectContainmentEList<TestElement>(TestElement.class, this,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);
- }
- return containedElements_NoOpposite;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getContainedElement_NoOpposite()
- {
- return containedElement_NoOpposite;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public NotificationChain basicSetContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite,
- NotificationChain msgs)
- {
- final TestElement oldContainedElement_NoOpposite = containedElement_NoOpposite;
- containedElement_NoOpposite = newContainedElement_NoOpposite;
- if (eNotificationRequired())
- {
- final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, oldContainedElement_NoOpposite,
- newContainedElement_NoOpposite);
- if (msgs == null) {
- msgs = notification;
- } else {
- msgs.add(notification);
- }
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite)
- {
- if (newContainedElement_NoOpposite != containedElement_NoOpposite)
- {
- NotificationChain msgs = null;
- if (containedElement_NoOpposite != null) {
- msgs = ((InternalEObject) containedElement_NoOpposite).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);
- }
- if (newContainedElement_NoOpposite != null) {
- msgs = ((InternalEObject) newContainedElement_NoOpposite).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
- - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);
- }
- msgs = basicSetContainedElement_NoOpposite(newContainedElement_NoOpposite, msgs);
- if (msgs != null) {
- msgs.dispatch();
- }
- }
- else if (eNotificationRequired()) {
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, newContainedElement_NoOpposite,
- newContainedElement_NoOpposite));
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public FeatureMap getFeatureMapEntries()
- {
- if (featureMapEntries == null)
- {
- featureMapEntries = new BasicFeatureMap(this, TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES);
- }
- return featureMapEntries;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getFeatureMapReferences1()
- {
- return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EList<TestElement> getFeatureMapReferences2()
- {
- return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements())
- .basicAdd(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
- if (containedElement != null) {
- msgs = ((InternalEObject) containedElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
- - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, null, msgs);
- }
- return basicSetContainedElement((TestElement) otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- if (eInternalContainer() != null) {
- msgs = eBasicRemoveFromContainer(msgs);
- }
- return basicSetContainer((TestElement) otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- if (eInternalContainer() != null) {
- msgs = eBasicRemoveFromContainer(msgs);
- }
- return basicSetSrefContainer((TestElement) otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
- if (nonContained_NTo1 != null) {
- msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,
- TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
- }
- return basicSetNonContained_NTo1((TestElement) otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_1ToN())
- .basicAdd(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_NToM())
- .basicAdd(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_MToN())
- .basicAdd(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
- return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements2()).basicAdd(otherEnd,
- msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- if (eInternalContainer() != null) {
- msgs = eBasicRemoveFromContainer(msgs);
- }
- return basicSetContainer2((TestElement) otherEnd, msgs);
- }
- return super.eInverseAdd(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
- return ((InternalEList<?>) getContainedElements()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
- return basicSetContainedElement(null, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- return basicSetContainer(null, msgs);
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- return basicSetSrefContainer(null, msgs);
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
- return ((InternalEList<?>) getElementMap()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
- return ((InternalEList<?>) getStringToStringMap()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
- return ((InternalEList<?>) getElementToStringMap()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
- return ((InternalEList<?>) getStringToElementMap()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
- return basicSetNonContained_NTo1(null, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
- return ((InternalEList<?>) getNonContained_1ToN()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
- return ((InternalEList<?>) getNonContained_NToM()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
- return ((InternalEList<?>) getNonContained_MToN()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
- return ((InternalEList<?>) getContainedElements2()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- return basicSetContainer2(null, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
- return ((InternalEList<?>) getContainedElements_NoOpposite()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
- return basicSetContainedElement_NoOpposite(null, msgs);
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
- return ((InternalEList<?>) getFeatureMapEntries()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
- return ((InternalEList<?>) getFeatureMapReferences1()).basicRemove(otherEnd, msgs);
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
- return ((InternalEList<?>) getFeatureMapReferences2()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
- switch (eContainerFeatureID())
- {
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS,
- TestElement.class, msgs);
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,
- TestElement.class, msgs);
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2,
- TestElement.class, msgs);
- }
- return super.eBasicRemoveFromContainerFeature(msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT__NAME:
- return getName();
- case TestmodelPackage.TEST_ELEMENT__STRINGS:
- return getStrings();
- case TestmodelPackage.TEST_ELEMENT__REFERENCES:
- return getReferences();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
- return getContainedElements();
- case TestmodelPackage.TEST_ELEMENT__REFERENCE:
- if (resolve) {
- return getReference();
- }
- return basicGetReference();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
- return getContainedElement();
- case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
- if (resolve) {
- return getOtherReference();
- }
- return basicGetOtherReference();
- case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
- return getDescription();
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- return getContainer();
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- return getSrefContainer();
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
- if (coreType) {
- return getElementMap();
- }
- return getElementMap().map();
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
- if (coreType) {
- return getStringToStringMap();
- }
- return getStringToStringMap().map();
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
- if (coreType) {
- return getElementToStringMap();
- }
- return getElementToStringMap().map();
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
- if (coreType) {
- return getStringToElementMap();
- }
- return getStringToElementMap().map();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
- if (resolve) {
- return getNonContained_NTo1();
- }
- return basicGetNonContained_NTo1();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
- return getNonContained_1ToN();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
- return getNonContained_NToM();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
- return getNonContained_MToN();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
- return getContainedElements2();
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- return getContainer2();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
- return getContainedElements_NoOpposite();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
- return getContainedElement_NoOpposite();
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
- if (coreType) {
- return getFeatureMapEntries();
- }
- return ((FeatureMap.Internal) getFeatureMapEntries()).getWrapper();
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
- return getFeatureMapReferences1();
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
- return getFeatureMapReferences2();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT__NAME:
- setName((String) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__STRINGS:
- getStrings().clear();
- getStrings().addAll((Collection<? extends String>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__REFERENCES:
- getReferences().clear();
- getReferences().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
- getContainedElements().clear();
- getContainedElements().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__REFERENCE:
- setReference((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
- setContainedElement((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
- setOtherReference((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
- setDescription((String) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- setContainer((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- setSrefContainer((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
- ((EStructuralFeature.Setting) getElementMap()).set(newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
- ((EStructuralFeature.Setting) getStringToStringMap()).set(newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
- ((EStructuralFeature.Setting) getElementToStringMap()).set(newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
- ((EStructuralFeature.Setting) getStringToElementMap()).set(newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
- setNonContained_NTo1((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
- getNonContained_1ToN().clear();
- getNonContained_1ToN().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
- getNonContained_NToM().clear();
- getNonContained_NToM().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
- getNonContained_MToN().clear();
- getNonContained_MToN().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
- getContainedElements2().clear();
- getContainedElements2().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- setContainer2((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
- getContainedElements_NoOpposite().clear();
- getContainedElements_NoOpposite().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
- setContainedElement_NoOpposite((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
- ((FeatureMap.Internal) getFeatureMapEntries()).set(newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
- getFeatureMapReferences1().clear();
- getFeatureMapReferences1().addAll((Collection<? extends TestElement>) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
- getFeatureMapReferences2().clear();
- getFeatureMapReferences2().addAll((Collection<? extends TestElement>) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT__NAME:
- setName(NAME_EDEFAULT);
- return;
- case TestmodelPackage.TEST_ELEMENT__STRINGS:
- getStrings().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__REFERENCES:
- getReferences().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
- getContainedElements().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__REFERENCE:
- setReference((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
- setContainedElement((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
- setOtherReference((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
- setDescription(DESCRIPTION_EDEFAULT);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- setContainer((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- setSrefContainer((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
- getElementMap().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
- getStringToStringMap().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
- getElementToStringMap().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
- getStringToElementMap().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
- setNonContained_NTo1((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
- getNonContained_1ToN().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
- getNonContained_NToM().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
- getNonContained_MToN().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
- getContainedElements2().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- setContainer2((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
- getContainedElements_NoOpposite().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
- setContainedElement_NoOpposite((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
- getFeatureMapEntries().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
- getFeatureMapReferences1().clear();
- return;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
- getFeatureMapReferences2().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT__NAME:
- return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
- case TestmodelPackage.TEST_ELEMENT__STRINGS:
- return strings != null && !strings.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__REFERENCES:
- return references != null && !references.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
- return containedElements != null && !containedElements.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__REFERENCE:
- return reference != null;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
- return containedElement != null;
- case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
- return otherReference != null;
- case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
- return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
- case TestmodelPackage.TEST_ELEMENT__CONTAINER:
- return getContainer() != null;
- case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
- return getSrefContainer() != null;
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
- return elementMap != null && !elementMap.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
- return stringToStringMap != null && !stringToStringMap.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
- return elementToStringMap != null && !elementToStringMap.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
- return stringToElementMap != null && !stringToElementMap.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
- return nonContained_NTo1 != null;
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
- return nonContained_1ToN != null && !nonContained_1ToN.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
- return nonContained_NToM != null && !nonContained_NToM.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
- return nonContained_MToN != null && !nonContained_MToN.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
- return containedElements2 != null && !containedElements2.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
- return getContainer2() != null;
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
- return containedElements_NoOpposite != null && !containedElements_NoOpposite.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
- return containedElement_NoOpposite != null;
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
- return featureMapEntries != null && !featureMapEntries.isEmpty();
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
- return !getFeatureMapReferences1().isEmpty();
- case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
- return !getFeatureMapReferences2().isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy()) {
- return super.toString();
- }
-
- final StringBuffer result = new StringBuffer(super.toString());
- result.append(" (name: "); //$NON-NLS-1$
- result.append(name);
- result.append(", strings: "); //$NON-NLS-1$
- result.append(strings);
- result.append(", description: "); //$NON-NLS-1$
- result.append(description);
- result.append(", featureMapEntries: "); //$NON-NLS-1$
- result.append(featureMapEntries);
- result.append(')');
- return result.toString();
- }
-
-} // TestElementImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.BasicFeatureMap;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreEMap;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStrings <em>Strings</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReferences <em>References</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements <em>Contained Elements</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement <em>Contained Element</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getOtherReference <em>Other Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer <em>Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getSrefContainer <em>Sref Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementMap <em>Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToStringMap
+ * <em>String To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementToStringMap
+ * <em>Element To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToElementMap
+ * <em>String To Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NTo1 <em>Non Contained NTo1</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_1ToN <em>Non Contained 1To N</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NToM <em>Non Contained NTo M</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_MToN <em>Non Contained MTo N</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements2
+ * <em>Contained Elements2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer2 <em>Container2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements_NoOpposite
+ * <em>Contained Elements No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement_NoOpposite
+ * <em>Contained Element No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapEntries <em>Feature Map Entries</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences1
+ * <em>Feature Map References1</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences2
+ * <em>Feature Map References2</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TestElementImpl extends EObjectImpl implements TestElement {
+ /**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getStrings() <em>Strings</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getStrings()
+ * @generated
+ * @ordered
+ */
+ protected EList<String> strings;
+
+ /**
+ * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getReferences()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> references;
+
+ /**
+ * The cached value of the '{@link #getContainedElements() <em>Contained Elements</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getContainedElements()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> containedElements;
+
+ /**
+ * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getReference()
+ * @generated
+ * @ordered
+ */
+ protected TestElement reference;
+
+ /**
+ * The cached value of the '{@link #getContainedElement() <em>Contained Element</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getContainedElement()
+ * @generated
+ * @ordered
+ */
+ protected TestElement containedElement;
+
+ /**
+ * The cached value of the '{@link #getOtherReference() <em>Other Reference</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getOtherReference()
+ * @generated
+ * @ordered
+ */
+ protected TestElement otherReference;
+
+ /**
+ * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected static final String DESCRIPTION_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getDescription()
+ * @generated
+ * @ordered
+ */
+ protected String description = DESCRIPTION_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getElementMap() <em>Element Map</em>}' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getElementMap()
+ * @generated
+ * @ordered
+ */
+ protected EMap<TestElement, TestElement> elementMap;
+
+ /**
+ * The cached value of the '{@link #getStringToStringMap() <em>String To String Map</em>}' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getStringToStringMap()
+ * @generated
+ * @ordered
+ */
+ protected EMap<String, String> stringToStringMap;
+
+ /**
+ * The cached value of the '{@link #getElementToStringMap() <em>Element To String Map</em>}' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getElementToStringMap()
+ * @generated
+ * @ordered
+ */
+ protected EMap<TestElement, String> elementToStringMap;
+
+ /**
+ * The cached value of the '{@link #getStringToElementMap() <em>String To Element Map</em>}' map.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getStringToElementMap()
+ * @generated
+ * @ordered
+ */
+ protected EMap<String, TestElement> stringToElementMap;
+
+ /**
+ * The cached value of the '{@link #getNonContained_NTo1() <em>Non Contained NTo1</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getNonContained_NTo1()
+ * @generated
+ * @ordered
+ */
+ protected TestElement nonContained_NTo1;
+
+ /**
+ * The cached value of the '{@link #getNonContained_1ToN() <em>Non Contained 1To N</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getNonContained_1ToN()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> nonContained_1ToN;
+
+ /**
+ * The cached value of the '{@link #getNonContained_NToM() <em>Non Contained NTo M</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getNonContained_NToM()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> nonContained_NToM;
+
+ /**
+ * The cached value of the '{@link #getNonContained_MToN() <em>Non Contained MTo N</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getNonContained_MToN()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> nonContained_MToN;
+
+ /**
+ * The cached value of the '{@link #getContainedElements2() <em>Contained Elements2</em>}' containment reference
+ * list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getContainedElements2()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> containedElements2;
+
+ /**
+ * The cached value of the '{@link #getContainedElements_NoOpposite() <em>Contained Elements No Opposite</em>}'
+ * containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getContainedElements_NoOpposite()
+ * @generated
+ * @ordered
+ */
+ protected EList<TestElement> containedElements_NoOpposite;
+
+ /**
+ * The cached value of the '{@link #getContainedElement_NoOpposite() <em>Contained Element No Opposite</em>}'
+ * containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getContainedElement_NoOpposite()
+ * @generated
+ * @ordered
+ */
+ protected TestElement containedElement_NoOpposite;
+
+ /**
+ * The cached value of the '{@link #getFeatureMapEntries() <em>Feature Map Entries</em>}' attribute list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getFeatureMapEntries()
+ * @generated
+ * @ordered
+ */
+ protected FeatureMap featureMapEntries;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected TestElementImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return TestmodelPackage.Literals.TEST_ELEMENT;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setName(String newName) {
+ final String oldName = name;
+ name = newName;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NAME, oldName, name));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<String> getStrings() {
+ if (strings == null) {
+ strings = new EDataTypeUniqueEList<String>(String.class, this, TestmodelPackage.TEST_ELEMENT__STRINGS);
+ }
+ return strings;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getReferences() {
+ if (references == null) {
+ references = new EObjectResolvingEList<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__REFERENCES);
+ }
+ return references;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getContainedElements() {
+ if (containedElements == null) {
+ containedElements = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestmodelPackage.TEST_ELEMENT__CONTAINER);
+ }
+ return containedElements;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getReference() {
+ if (reference != null && reference.eIsProxy()) {
+ final InternalEObject oldReference = (InternalEObject) reference;
+ reference = (TestElement) eResolveProxy(oldReference);
+ if (reference != oldReference) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, TestmodelPackage.TEST_ELEMENT__REFERENCE,
+ oldReference, reference));
+ }
+ }
+ }
+ return reference;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetReference() {
+ return reference;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setReference(TestElement newReference) {
+ final TestElement oldReference = reference;
+ reference = newReference;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__REFERENCE,
+ oldReference, reference));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getContainedElement() {
+ return containedElement;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetContainedElement(TestElement newContainedElement, NotificationChain msgs) {
+ final TestElement oldContainedElement = containedElement;
+ containedElement = newContainedElement;
+ if (eNotificationRequired()) {
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, oldContainedElement, newContainedElement);
+ if (msgs == null) {
+ msgs = notification;
+ } else {
+ msgs.add(notification);
+ }
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContainedElement(TestElement newContainedElement) {
+ if (newContainedElement != containedElement) {
+ NotificationChain msgs = null;
+ if (containedElement != null) {
+ msgs = ((InternalEObject) containedElement).eInverseRemove(this,
+ TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);
+ }
+ if (newContainedElement != null) {
+ msgs = ((InternalEObject) newContainedElement).eInverseAdd(this,
+ TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);
+ }
+ msgs = basicSetContainedElement(newContainedElement, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,
+ newContainedElement, newContainedElement));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getOtherReference() {
+ if (otherReference != null && otherReference.eIsProxy()) {
+ final InternalEObject oldOtherReference = (InternalEObject) otherReference;
+ otherReference = (TestElement) eResolveProxy(oldOtherReference);
+ if (otherReference != oldOtherReference) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE, oldOtherReference, otherReference));
+ }
+ }
+ }
+ return otherReference;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetOtherReference() {
+ return otherReference;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setOtherReference(TestElement newOtherReference) {
+ final TestElement oldOtherReference = otherReference;
+ otherReference = newOtherReference;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE,
+ oldOtherReference, otherReference));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setDescription(String newDescription) {
+ final String oldDescription = description;
+ description = newDescription;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__DESCRIPTION,
+ oldDescription, description));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getContainer() {
+ if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER) {
+ return null;
+ }
+ return (TestElement) eInternalContainer();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetContainer(TestElement newContainer, NotificationChain msgs) {
+ msgs = eBasicSetContainer((InternalEObject) newContainer, TestmodelPackage.TEST_ELEMENT__CONTAINER, msgs);
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContainer(TestElement newContainer) {
+ if (newContainer != eInternalContainer()
+ || eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER && newContainer != null) {
+ if (EcoreUtil.isAncestor(this, newContainer)) {
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+ }
+ NotificationChain msgs = null;
+ if (eInternalContainer() != null) {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ if (newContainer != null) {
+ msgs = ((InternalEObject) newContainer).eInverseAdd(this,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestElement.class, msgs);
+ }
+ msgs = basicSetContainer(newContainer, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER,
+ newContainer, newContainer));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getSrefContainer() {
+ if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER) {
+ return null;
+ }
+ return (TestElement) eInternalContainer();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetSrefContainer(TestElement newSrefContainer, NotificationChain msgs) {
+ msgs = eBasicSetContainer((InternalEObject) newSrefContainer, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,
+ msgs);
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setSrefContainer(TestElement newSrefContainer) {
+ if (newSrefContainer != eInternalContainer()
+ || eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER && newSrefContainer != null) {
+ if (EcoreUtil.isAncestor(this, newSrefContainer)) {
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+ }
+ NotificationChain msgs = null;
+ if (eInternalContainer() != null) {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ if (newSrefContainer != null) {
+ msgs = ((InternalEObject) newSrefContainer).eInverseAdd(this,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, TestElement.class, msgs);
+ }
+ msgs = basicSetSrefContainer(newSrefContainer, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,
+ newSrefContainer, newSrefContainer));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EMap<TestElement, TestElement> getElementMap() {
+ if (elementMap == null) {
+ elementMap = new EcoreEMap<TestElement, TestElement>(
+ TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP, TestElementToTestElementMapImpl.class, this,
+ TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP);
+ }
+ return elementMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EMap<String, String> getStringToStringMap() {
+ if (stringToStringMap == null) {
+ stringToStringMap = new EcoreEMap<String, String>(TestmodelPackage.Literals.STRING_TO_STRING_MAP,
+ StringToStringMapImpl.class, this, TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP);
+ }
+ return stringToStringMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EMap<TestElement, String> getElementToStringMap() {
+ if (elementToStringMap == null) {
+ elementToStringMap = new EcoreEMap<TestElement, String>(
+ TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP, TestElementToStringMapImpl.class, this,
+ TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP);
+ }
+ return elementToStringMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EMap<String, TestElement> getStringToElementMap() {
+ if (stringToElementMap == null) {
+ stringToElementMap = new EcoreEMap<String, TestElement>(
+ TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP, StringToTestElementMapImpl.class, this,
+ TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP);
+ }
+ return stringToElementMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getNonContained_NTo1() {
+ if (nonContained_NTo1 != null && nonContained_NTo1.eIsProxy()) {
+ final InternalEObject oldNonContained_NTo1 = (InternalEObject) nonContained_NTo1;
+ nonContained_NTo1 = (TestElement) eResolveProxy(oldNonContained_NTo1);
+ if (nonContained_NTo1 != oldNonContained_NTo1) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, nonContained_NTo1));
+ }
+ }
+ }
+ return nonContained_NTo1;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetNonContained_NTo1() {
+ return nonContained_NTo1;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetNonContained_NTo1(TestElement newNonContained_NTo1, NotificationChain msgs) {
+ final TestElement oldNonContained_NTo1 = nonContained_NTo1;
+ nonContained_NTo1 = newNonContained_NTo1;
+ if (eNotificationRequired()) {
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, newNonContained_NTo1);
+ if (msgs == null) {
+ msgs = notification;
+ } else {
+ msgs.add(notification);
+ }
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setNonContained_NTo1(TestElement newNonContained_NTo1) {
+ if (newNonContained_NTo1 != nonContained_NTo1) {
+ NotificationChain msgs = null;
+ if (nonContained_NTo1 != null) {
+ msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
+ }
+ if (newNonContained_NTo1 != null) {
+ msgs = ((InternalEObject) newNonContained_NTo1).eInverseAdd(this,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
+ }
+ msgs = basicSetNonContained_NTo1(newNonContained_NTo1, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1,
+ newNonContained_NTo1, newNonContained_NTo1));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getNonContained_1ToN() {
+ if (nonContained_1ToN == null) {
+ nonContained_1ToN = new EObjectWithInverseResolvingEList<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1);
+ }
+ return nonContained_1ToN;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getNonContained_NToM() {
+ if (nonContained_NToM == null) {
+ nonContained_NToM = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N);
+ }
+ return nonContained_NToM;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getNonContained_MToN() {
+ if (nonContained_MToN == null) {
+ nonContained_MToN = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M);
+ }
+ return nonContained_MToN;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getContainedElements2() {
+ if (containedElements2 == null) {
+ containedElements2 = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestmodelPackage.TEST_ELEMENT__CONTAINER2);
+ }
+ return containedElements2;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getContainer2() {
+ if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2) {
+ return null;
+ }
+ return (TestElement) eInternalContainer();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetContainer2(TestElement newContainer2, NotificationChain msgs) {
+ msgs = eBasicSetContainer((InternalEObject) newContainer2, TestmodelPackage.TEST_ELEMENT__CONTAINER2, msgs);
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContainer2(TestElement newContainer2) {
+ if (newContainer2 != eInternalContainer()
+ || eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2 && newContainer2 != null) {
+ if (EcoreUtil.isAncestor(this, newContainer2)) {
+ throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+ }
+ NotificationChain msgs = null;
+ if (eInternalContainer() != null) {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ if (newContainer2 != null) {
+ msgs = ((InternalEObject) newContainer2).eInverseAdd(this,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestElement.class, msgs);
+ }
+ msgs = basicSetContainer2(newContainer2, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER2,
+ newContainer2, newContainer2));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getContainedElements_NoOpposite() {
+ if (containedElements_NoOpposite == null) {
+ containedElements_NoOpposite = new EObjectContainmentEList<TestElement>(TestElement.class, this,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);
+ }
+ return containedElements_NoOpposite;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getContainedElement_NoOpposite() {
+ return containedElement_NoOpposite;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public NotificationChain basicSetContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite,
+ NotificationChain msgs) {
+ final TestElement oldContainedElement_NoOpposite = containedElement_NoOpposite;
+ containedElement_NoOpposite = newContainedElement_NoOpposite;
+ if (eNotificationRequired()) {
+ final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, oldContainedElement_NoOpposite,
+ newContainedElement_NoOpposite);
+ if (msgs == null) {
+ msgs = notification;
+ } else {
+ msgs.add(notification);
+ }
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite) {
+ if (newContainedElement_NoOpposite != containedElement_NoOpposite) {
+ NotificationChain msgs = null;
+ if (containedElement_NoOpposite != null) {
+ msgs = ((InternalEObject) containedElement_NoOpposite).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);
+ }
+ if (newContainedElement_NoOpposite != null) {
+ msgs = ((InternalEObject) newContainedElement_NoOpposite).eInverseAdd(this,
+ EOPPOSITE_FEATURE_BASE - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);
+ }
+ msgs = basicSetContainedElement_NoOpposite(newContainedElement_NoOpposite, msgs);
+ if (msgs != null) {
+ msgs.dispatch();
+ }
+ } else if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, newContainedElement_NoOpposite,
+ newContainedElement_NoOpposite));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public FeatureMap getFeatureMapEntries() {
+ if (featureMapEntries == null) {
+ featureMapEntries = new BasicFeatureMap(this, TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES);
+ }
+ return featureMapEntries;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getFeatureMapReferences1() {
+ return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EList<TestElement> getFeatureMapReferences2() {
+ return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+ return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements()).basicAdd(otherEnd,
+ msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+ if (containedElement != null) {
+ msgs = ((InternalEObject) containedElement).eInverseRemove(this,
+ EOPPOSITE_FEATURE_BASE - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, null, msgs);
+ }
+ return basicSetContainedElement((TestElement) otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ if (eInternalContainer() != null) {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ return basicSetContainer((TestElement) otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ if (eInternalContainer() != null) {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ return basicSetSrefContainer((TestElement) otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+ if (nonContained_NTo1 != null) {
+ msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,
+ TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
+ }
+ return basicSetNonContained_NTo1((TestElement) otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+ return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_1ToN()).basicAdd(otherEnd,
+ msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+ return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_NToM()).basicAdd(otherEnd,
+ msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+ return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_MToN()).basicAdd(otherEnd,
+ msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+ return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements2()).basicAdd(otherEnd,
+ msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ if (eInternalContainer() != null) {
+ msgs = eBasicRemoveFromContainer(msgs);
+ }
+ return basicSetContainer2((TestElement) otherEnd, msgs);
+ }
+ return super.eInverseAdd(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+ return ((InternalEList<?>) getContainedElements()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+ return basicSetContainedElement(null, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ return basicSetContainer(null, msgs);
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ return basicSetSrefContainer(null, msgs);
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+ return ((InternalEList<?>) getElementMap()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+ return ((InternalEList<?>) getStringToStringMap()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+ return ((InternalEList<?>) getElementToStringMap()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+ return ((InternalEList<?>) getStringToElementMap()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+ return basicSetNonContained_NTo1(null, msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+ return ((InternalEList<?>) getNonContained_1ToN()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+ return ((InternalEList<?>) getNonContained_NToM()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+ return ((InternalEList<?>) getNonContained_MToN()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+ return ((InternalEList<?>) getContainedElements2()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ return basicSetContainer2(null, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+ return ((InternalEList<?>) getContainedElements_NoOpposite()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+ return basicSetContainedElement_NoOpposite(null, msgs);
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+ return ((InternalEList<?>) getFeatureMapEntries()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+ return ((InternalEList<?>) getFeatureMapReferences1()).basicRemove(otherEnd, msgs);
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+ return ((InternalEList<?>) getFeatureMapReferences2()).basicRemove(otherEnd, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+ switch (eContainerFeatureID()) {
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS,
+ TestElement.class, msgs);
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,
+ TestElement.class, msgs);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2,
+ TestElement.class, msgs);
+ }
+ return super.eBasicRemoveFromContainerFeature(msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT__NAME:
+ return getName();
+ case TestmodelPackage.TEST_ELEMENT__STRINGS:
+ return getStrings();
+ case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+ return getReferences();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+ return getContainedElements();
+ case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+ if (resolve) {
+ return getReference();
+ }
+ return basicGetReference();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+ return getContainedElement();
+ case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+ if (resolve) {
+ return getOtherReference();
+ }
+ return basicGetOtherReference();
+ case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+ return getDescription();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ return getContainer();
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ return getSrefContainer();
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+ if (coreType) {
+ return getElementMap();
+ } else {
+ return getElementMap().map();
+ }
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+ if (coreType) {
+ return getStringToStringMap();
+ } else {
+ return getStringToStringMap().map();
+ }
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+ if (coreType) {
+ return getElementToStringMap();
+ } else {
+ return getElementToStringMap().map();
+ }
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+ if (coreType) {
+ return getStringToElementMap();
+ } else {
+ return getStringToElementMap().map();
+ }
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+ if (resolve) {
+ return getNonContained_NTo1();
+ }
+ return basicGetNonContained_NTo1();
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+ return getNonContained_1ToN();
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+ return getNonContained_NToM();
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+ return getNonContained_MToN();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+ return getContainedElements2();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ return getContainer2();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+ return getContainedElements_NoOpposite();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+ return getContainedElement_NoOpposite();
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+ if (coreType) {
+ return getFeatureMapEntries();
+ }
+ return ((FeatureMap.Internal) getFeatureMapEntries()).getWrapper();
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+ return getFeatureMapReferences1();
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+ return getFeatureMapReferences2();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT__NAME:
+ setName((String) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__STRINGS:
+ getStrings().clear();
+ getStrings().addAll((Collection<? extends String>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+ getReferences().clear();
+ getReferences().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+ getContainedElements().clear();
+ getContainedElements().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+ setReference((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+ setContainedElement((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+ setOtherReference((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+ setDescription((String) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ setContainer((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ setSrefContainer((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+ ((EStructuralFeature.Setting) getElementMap()).set(newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+ ((EStructuralFeature.Setting) getStringToStringMap()).set(newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+ ((EStructuralFeature.Setting) getElementToStringMap()).set(newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+ ((EStructuralFeature.Setting) getStringToElementMap()).set(newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+ setNonContained_NTo1((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+ getNonContained_1ToN().clear();
+ getNonContained_1ToN().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+ getNonContained_NToM().clear();
+ getNonContained_NToM().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+ getNonContained_MToN().clear();
+ getNonContained_MToN().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+ getContainedElements2().clear();
+ getContainedElements2().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ setContainer2((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+ getContainedElements_NoOpposite().clear();
+ getContainedElements_NoOpposite().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+ setContainedElement_NoOpposite((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+ ((FeatureMap.Internal) getFeatureMapEntries()).set(newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+ getFeatureMapReferences1().clear();
+ getFeatureMapReferences1().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+ getFeatureMapReferences2().clear();
+ getFeatureMapReferences2().addAll((Collection<? extends TestElement>) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__STRINGS:
+ getStrings().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+ getReferences().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+ getContainedElements().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+ setReference((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+ setContainedElement((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+ setOtherReference((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+ setDescription(DESCRIPTION_EDEFAULT);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ setContainer((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ setSrefContainer((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+ getElementMap().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+ getStringToStringMap().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+ getElementToStringMap().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+ getStringToElementMap().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+ setNonContained_NTo1((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+ getNonContained_1ToN().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+ getNonContained_NToM().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+ getNonContained_MToN().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+ getContainedElements2().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ setContainer2((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+ getContainedElements_NoOpposite().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+ setContainedElement_NoOpposite((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+ getFeatureMapEntries().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+ getFeatureMapReferences1().clear();
+ return;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+ getFeatureMapReferences2().clear();
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT__NAME:
+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+ case TestmodelPackage.TEST_ELEMENT__STRINGS:
+ return strings != null && !strings.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+ return references != null && !references.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+ return containedElements != null && !containedElements.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+ return reference != null;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+ return containedElement != null;
+ case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+ return otherReference != null;
+ case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+ return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+ return getContainer() != null;
+ case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+ return getSrefContainer() != null;
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+ return elementMap != null && !elementMap.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+ return stringToStringMap != null && !stringToStringMap.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+ return elementToStringMap != null && !elementToStringMap.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+ return stringToElementMap != null && !stringToElementMap.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+ return nonContained_NTo1 != null;
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+ return nonContained_1ToN != null && !nonContained_1ToN.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+ return nonContained_NToM != null && !nonContained_NToM.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+ return nonContained_MToN != null && !nonContained_MToN.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+ return containedElements2 != null && !containedElements2.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+ return getContainer2() != null;
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+ return containedElements_NoOpposite != null && !containedElements_NoOpposite.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+ return containedElement_NoOpposite != null;
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+ return featureMapEntries != null && !featureMapEntries.isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+ return !getFeatureMapReferences1().isEmpty();
+ case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+ return !getFeatureMapReferences2().isEmpty();
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) {
+ return super.toString();
+ }
+
+ final StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: "); //$NON-NLS-1$
+ result.append(name);
+ result.append(", strings: "); //$NON-NLS-1$
+ result.append(strings);
+ result.append(", description: "); //$NON-NLS-1$
+ result.append(description);
+ result.append(", featureMapEntries: "); //$NON-NLS-1$
+ result.append(featureMapEntries);
+ result.append(')');
+ return result.toString();
+ }
+
+} // TestElementImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java
index 516ea65..4120e37 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java
@@ -1,346 +1,344 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Test Element To String Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedKey <em>Key</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TestElementToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, String> {
- /**
- * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected TestElement key;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected TestElementToStringMapImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getTypedValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedValue(String newValue) {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE,
- oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getTypedKey() {
- if (key != null && key.eIsProxy())
- {
- InternalEObject oldKey = (InternalEObject) key;
- key = (TestElement) eResolveProxy(oldKey);
- if (key != oldKey)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY, oldKey, key));
- }
- }
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetTypedKey() {
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedKey(TestElement newKey) {
- TestElement oldKey = key;
- key = newKey;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY,
- oldKey, key));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
- return getTypedValue();
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
- if (resolve)
- return getTypedKey();
- return basicGetTypedKey();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
- setTypedValue((String) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
- setTypedKey((TestElement) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
- setTypedValue(VALUE_EDEFAULT);
- return;
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
- setTypedKey((TestElement) null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
- return key != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public String toString() {
- if (eIsProxy())
- return super.toString();
-
- StringBuffer result = new StringBuffer(super.toString());
- result.append(" (value: "); //$NON-NLS-1$
- result.append(value);
- result.append(')');
- return result.toString();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected int hash = -1;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public int getHash() {
- if (hash == -1)
- {
- Object theKey = getKey();
- hash = (theKey == null ? 0 : theKey.hashCode());
- }
- return hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setHash(int hash) {
- this.hash = hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getKey() {
- return getTypedKey();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setKey(TestElement key) {
- setTypedKey(key);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String getValue() {
- return getTypedValue();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public String setValue(String value) {
- String oldValue = getValue();
- setTypedValue(value);
- return oldValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- public EMap<TestElement, String> getEMap() {
- EObject container = eContainer();
- return container == null ? null : (EMap<TestElement, String>) container.eGet(eContainmentFeature());
- }
-
-} // TestElementToStringMapImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element To String Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TestElementToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, String> {
+ /**
+ * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedValue()
+ * @generated
+ * @ordered
+ */
+ protected static final String VALUE_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedValue()
+ * @generated
+ * @ordered
+ */
+ protected String value = VALUE_EDEFAULT;
+
+ /**
+ * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedKey()
+ * @generated
+ * @ordered
+ */
+ protected TestElement key;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected TestElementToStringMapImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getTypedValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedValue(String newValue) {
+ final String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE,
+ oldValue, value));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getTypedKey() {
+ if (key != null && key.eIsProxy()) {
+ final InternalEObject oldKey = (InternalEObject) key;
+ key = (TestElement) eResolveProxy(oldKey);
+ if (key != oldKey) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY, oldKey, key));
+ }
+ }
+ }
+ return key;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetTypedKey() {
+ return key;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedKey(TestElement newKey) {
+ final TestElement oldKey = key;
+ key = newKey;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY,
+ oldKey, key));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+ return getTypedValue();
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+ if (resolve) {
+ return getTypedKey();
+ }
+ return basicGetTypedKey();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+ setTypedValue((String) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+ setTypedKey((TestElement) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+ setTypedValue(VALUE_EDEFAULT);
+ return;
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+ setTypedKey((TestElement) null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+ return key != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public String toString() {
+ if (eIsProxy()) {
+ return super.toString();
+ }
+
+ final StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (value: "); //$NON-NLS-1$
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected int hash = -1;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public int getHash() {
+ if (hash == -1) {
+ final Object theKey = getKey();
+ hash = theKey == null ? 0 : theKey.hashCode();
+ }
+ return hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setHash(int hash) {
+ this.hash = hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getKey() {
+ return getTypedKey();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setKey(TestElement key) {
+ setTypedKey(key);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String getValue() {
+ return getTypedValue();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public String setValue(String value) {
+ final String oldValue = getValue();
+ setTypedValue(value);
+ return oldValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ public EMap<TestElement, String> getEMap() {
+ final EObject container = eContainer();
+ return container == null ? null : (EMap<TestElement, String>) container.eGet(eContainmentFeature());
+ }
+
+} // TestElementToStringMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java
index d648319..9ab80cf 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java
@@ -1,340 +1,338 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEMap;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Test Element To Test Element Map</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedValue <em>Value</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedKey <em>Key</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TestElementToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, TestElement> {
- /**
- * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedValue()
- * @generated
- * @ordered
- */
- protected TestElement value;
-
- /**
- * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @see #getTypedKey()
- * @generated
- * @ordered
- */
- protected TestElement key;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected TestElementToTestElementMapImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getTypedValue() {
- if (value != null && value.eIsProxy())
- {
- InternalEObject oldValue = (InternalEObject) value;
- value = (TestElement) eResolveProxy(oldValue);
- if (value != oldValue)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
- }
- }
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetTypedValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedValue(TestElement newValue) {
- TestElement oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getTypedKey() {
- if (key != null && key.eIsProxy())
- {
- InternalEObject oldKey = (InternalEObject) key;
- key = (TestElement) eResolveProxy(oldKey);
- if (key != oldKey)
- {
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.RESOLVE,
- TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));
- }
- }
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement basicGetTypedKey() {
- return key;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setTypedKey(TestElement newKey) {
- TestElement oldKey = key;
- key = newKey;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
- TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
- if (resolve)
- return getTypedValue();
- return basicGetTypedValue();
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
- if (resolve)
- return getTypedKey();
- return basicGetTypedKey();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
- setTypedValue((TestElement) newValue);
- return;
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
- setTypedKey((TestElement) newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
- setTypedValue((TestElement) null);
- return;
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
- setTypedKey((TestElement) null);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID)
- {
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
- return value != null;
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
- return key != null;
- }
- return super.eIsSet(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected int hash = -1;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public int getHash() {
- if (hash == -1)
- {
- Object theKey = getKey();
- hash = (theKey == null ? 0 : theKey.hashCode());
- }
- return hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setHash(int hash) {
- this.hash = hash;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getKey() {
- return getTypedKey();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void setKey(TestElement key) {
- setTypedKey(key);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement getValue() {
- return getTypedValue();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement setValue(TestElement value) {
- TestElement oldValue = getValue();
- setTypedValue(value);
- return oldValue;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @SuppressWarnings("unchecked")
- public EMap<TestElement, TestElement> getEMap() {
- EObject container = eContainer();
- return container == null ? null : (EMap<TestElement, TestElement>) container.eGet(eContainmentFeature());
- }
-
-} // TestElementToTestElementMapImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element To Test Element Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedValue <em>Value</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedKey <em>Key</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TestElementToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, TestElement> {
+ /**
+ * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedValue()
+ * @generated
+ * @ordered
+ */
+ protected TestElement value;
+
+ /**
+ * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @see #getTypedKey()
+ * @generated
+ * @ordered
+ */
+ protected TestElement key;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected TestElementToTestElementMapImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getTypedValue() {
+ if (value != null && value.eIsProxy()) {
+ final InternalEObject oldValue = (InternalEObject) value;
+ value = (TestElement) eResolveProxy(oldValue);
+ if (value != oldValue) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
+ }
+ }
+ }
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetTypedValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedValue(TestElement newValue) {
+ final TestElement oldValue = value;
+ value = newValue;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getTypedKey() {
+ if (key != null && key.eIsProxy()) {
+ final InternalEObject oldKey = (InternalEObject) key;
+ key = (TestElement) eResolveProxy(oldKey);
+ if (key != oldKey) {
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+ TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));
+ }
+ }
+ }
+ return key;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement basicGetTypedKey() {
+ return key;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setTypedKey(TestElement newKey) {
+ final TestElement oldKey = key;
+ key = newKey;
+ if (eNotificationRequired()) {
+ eNotify(new ENotificationImpl(this, Notification.SET,
+ TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+ if (resolve) {
+ return getTypedValue();
+ }
+ return basicGetTypedValue();
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+ if (resolve) {
+ return getTypedKey();
+ }
+ return basicGetTypedKey();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+ setTypedValue((TestElement) newValue);
+ return;
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+ setTypedKey((TestElement) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+ setTypedValue((TestElement) null);
+ return;
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+ setTypedKey((TestElement) null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+ return value != null;
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+ return key != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected int hash = -1;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public int getHash() {
+ if (hash == -1) {
+ final Object theKey = getKey();
+ hash = theKey == null ? 0 : theKey.hashCode();
+ }
+ return hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setHash(int hash) {
+ this.hash = hash;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getKey() {
+ return getTypedKey();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setKey(TestElement key) {
+ setTypedKey(key);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement getValue() {
+ return getTypedValue();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement setValue(TestElement value) {
+ final TestElement oldValue = getValue();
+ setTypedValue(value);
+ return oldValue;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @SuppressWarnings("unchecked")
+ public EMap<TestElement, TestElement> getEMap() {
+ final EObject container = eContainer();
+ return container == null ? null : (EMap<TestElement, TestElement>) container.eGet(eContainmentFeature());
+ }
+
+} // TestElementToTestElementMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java
index f88637b..e090907 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
*/
@@ -24,20 +24,19 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl#getName <em>Name</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
-public class TestTypeImpl extends EObjectImpl implements TestType
-{
+public class TestTypeImpl extends EObjectImpl implements TestType {
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getName()
* @generated
* @ordered
@@ -48,7 +47,7 @@
* The cached value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getName()
* @generated
* @ordered
@@ -58,62 +57,57 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- protected TestTypeImpl()
- {
+ protected TestTypeImpl() {
super();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- protected EClass eStaticClass()
- {
+ protected EClass eStaticClass() {
return TestmodelPackage.Literals.TEST_TYPE;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public String getName()
- {
+ public String getName() {
return name;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public void setName(String newName)
- {
- String oldName = name;
+ public void setName(String newName) {
+ final String oldName = name;
name = newName;
- if (eNotificationRequired())
+ if (eNotificationRequired()) {
eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_TYPE__NAME, oldName, name));
+ }
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
case TestmodelPackage.TEST_TYPE__NAME:
return getName();
}
@@ -123,14 +117,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
case TestmodelPackage.TEST_TYPE__NAME:
setName((String) newValue);
return;
@@ -141,14 +133,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
+ public void eUnset(int featureID) {
+ switch (featureID) {
case TestmodelPackage.TEST_TYPE__NAME:
setName(NAME_EDEFAULT);
return;
@@ -159,14 +149,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
case TestmodelPackage.TEST_TYPE__NAME:
return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
}
@@ -176,16 +164,16 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public String toString()
- {
- if (eIsProxy())
+ public String toString() {
+ if (eIsProxy()) {
return super.toString();
+ }
- StringBuffer result = new StringBuffer(super.toString());
+ final StringBuffer result = new StringBuffer(super.toString());
result.append(" (name: "); //$NON-NLS-1$
result.append(name);
result.append(')');
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java
index a229d66..101369b 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java
@@ -1,214 +1,207 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestType;
-import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class TestmodelFactoryImpl extends EFactoryImpl implements TestmodelFactory {
- /**
- * Creates the default factory implementation.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public static TestmodelFactory init() {
- try
- {
- TestmodelFactory theTestmodelFactory = (TestmodelFactory) EPackage.Registry.INSTANCE
- .getEFactory(TestmodelPackage.eNS_URI);
- if (theTestmodelFactory != null)
- {
- return theTestmodelFactory;
- }
- } catch (Exception exception)
- {
- EcorePlugin.INSTANCE.log(exception);
- }
- return new TestmodelFactoryImpl();
- }
-
- /**
- * Creates an instance of the factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestmodelFactoryImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- @Override
- public EObject create(EClass eClass) {
- switch (eClass.getClassifierID())
- {
- case TestmodelPackage.TEST_ELEMENT:
- return createTestElement();
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP:
- return (EObject) createTestElementToStringMap();
- case TestmodelPackage.STRING_TO_STRING_MAP:
- return (EObject) createStringToStringMap();
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP:
- return (EObject) createTestElementToTestElementMap();
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP:
- return (EObject) createStringToTestElementMap();
- case TestmodelPackage.TEST_TYPE:
- return createTestType();
- case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT:
- return createTypeWithFeatureMapNonContainment();
- case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT:
- return createTypeWithFeatureMapContainment();
- default:
- throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestElement createTestElement() {
- TestElementImpl testElement = new TestElementImpl();
- return testElement;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Map.Entry<TestElement, String> createTestElementToStringMap() {
- TestElementToStringMapImpl testElementToStringMap = new TestElementToStringMapImpl();
- return testElementToStringMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Map.Entry<String, String> createStringToStringMap() {
- StringToStringMapImpl stringToStringMap = new StringToStringMapImpl();
- return stringToStringMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Map.Entry<TestElement, TestElement> createTestElementToTestElementMap() {
- TestElementToTestElementMapImpl testElementToTestElementMap = new TestElementToTestElementMapImpl();
- return testElementToTestElementMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public Map.Entry<String, TestElement> createStringToTestElementMap() {
- StringToTestElementMapImpl stringToTestElementMap = new StringToTestElementMapImpl();
- return stringToTestElementMap;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestType createTestType()
- {
- TestTypeImpl testType = new TestTypeImpl();
- return testType;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment()
- {
- TypeWithFeatureMapNonContainmentImpl typeWithFeatureMapNonContainment = new TypeWithFeatureMapNonContainmentImpl();
- return typeWithFeatureMapNonContainment;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TypeWithFeatureMapContainment createTypeWithFeatureMapContainment()
- {
- TypeWithFeatureMapContainmentImpl typeWithFeatureMapContainment = new TypeWithFeatureMapContainmentImpl();
- return typeWithFeatureMapContainment;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestmodelPackage getTestmodelPackage() {
- return (TestmodelPackage) getEPackage();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @deprecated
- * @generated
- */
- @Deprecated
- public static TestmodelPackage getPackage() {
- return TestmodelPackage.eINSTANCE;
- }
-
-} // TestmodelFactoryImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TestmodelFactoryImpl extends EFactoryImpl implements TestmodelFactory {
+ /**
+ * Creates the default factory implementation.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public static TestmodelFactory init() {
+ try {
+ final TestmodelFactory theTestmodelFactory = (TestmodelFactory) EPackage.Registry.INSTANCE
+ .getEFactory(TestmodelPackage.eNS_URI);
+ if (theTestmodelFactory != null) {
+ return theTestmodelFactory;
+ }
+ } catch (final Exception exception) {
+ EcorePlugin.INSTANCE.log(exception);
+ }
+ return new TestmodelFactoryImpl();
+ }
+
+ /**
+ * Creates an instance of the factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestmodelFactoryImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public EObject create(EClass eClass) {
+ switch (eClass.getClassifierID()) {
+ case TestmodelPackage.TEST_ELEMENT:
+ return createTestElement();
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP:
+ return (EObject) createTestElementToStringMap();
+ case TestmodelPackage.STRING_TO_STRING_MAP:
+ return (EObject) createStringToStringMap();
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP:
+ return (EObject) createTestElementToTestElementMap();
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP:
+ return (EObject) createStringToTestElementMap();
+ case TestmodelPackage.TEST_TYPE:
+ return createTestType();
+ case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT:
+ return createTypeWithFeatureMapNonContainment();
+ case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT:
+ return createTypeWithFeatureMapContainment();
+ default:
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestElement createTestElement() {
+ final TestElementImpl testElement = new TestElementImpl();
+ return testElement;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public Map.Entry<TestElement, String> createTestElementToStringMap() {
+ final TestElementToStringMapImpl testElementToStringMap = new TestElementToStringMapImpl();
+ return testElementToStringMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public Map.Entry<String, String> createStringToStringMap() {
+ final StringToStringMapImpl stringToStringMap = new StringToStringMapImpl();
+ return stringToStringMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public Map.Entry<TestElement, TestElement> createTestElementToTestElementMap() {
+ final TestElementToTestElementMapImpl testElementToTestElementMap = new TestElementToTestElementMapImpl();
+ return testElementToTestElementMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public Map.Entry<String, TestElement> createStringToTestElementMap() {
+ final StringToTestElementMapImpl stringToTestElementMap = new StringToTestElementMapImpl();
+ return stringToTestElementMap;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestType createTestType() {
+ final TestTypeImpl testType = new TestTypeImpl();
+ return testType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment() {
+ final TypeWithFeatureMapNonContainmentImpl typeWithFeatureMapNonContainment = new TypeWithFeatureMapNonContainmentImpl();
+ return typeWithFeatureMapNonContainment;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TypeWithFeatureMapContainment createTypeWithFeatureMapContainment() {
+ final TypeWithFeatureMapContainmentImpl typeWithFeatureMapContainment = new TypeWithFeatureMapContainmentImpl();
+ return typeWithFeatureMapContainment;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestmodelPackage getTestmodelPackage() {
+ return (TestmodelPackage) getEPackage();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @deprecated
+ * @generated
+ */
+ @Deprecated
+ public static TestmodelPackage getPackage() {
+ return TestmodelPackage.eINSTANCE;
+ }
+
+} // TestmodelFactoryImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java
index e696c1f..cd6d03b 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java
@@ -1,1061 +1,980 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.impl;
-
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestType;
-import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class TestmodelPackageImpl extends EPackageImpl implements TestmodelPackage {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass testElementEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass testElementToStringMapEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass stringToStringMapEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass testElementToTestElementMapEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass stringToTestElementMapEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass testTypeEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass typeWithFeatureMapNonContainmentEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private EClass typeWithFeatureMapContainmentEClass = null;
-
- /**
- * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
- * EPackage.Registry} by the package
- * package URI value.
- * <p>
- * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
- * performs initialization of the package, or returns the registered package, if one already exists. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.ecore.EPackage.Registry
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#eNS_URI
- * @see #init()
- * @generated
- */
- private TestmodelPackageImpl() {
- super(eNS_URI, TestmodelFactory.eINSTANCE);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private static boolean isInited = false;
-
- /**
- * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
- * <p>
- * This method is used to initialize {@link TestmodelPackage#eINSTANCE} when that field is accessed. Clients should
- * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
- * --> <!-- end-user-doc -->
- *
- * @see #eNS_URI
- * @see #createPackageContents()
- * @see #initializePackageContents()
- * @generated
- */
- public static TestmodelPackage init() {
- if (isInited)
- return (TestmodelPackage) EPackage.Registry.INSTANCE.getEPackage(TestmodelPackage.eNS_URI);
-
- // Obtain or create and register package
- TestmodelPackageImpl theTestmodelPackage = (TestmodelPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestmodelPackageImpl ? EPackage.Registry.INSTANCE
- .get(eNS_URI)
- : new TestmodelPackageImpl());
-
- isInited = true;
-
- // Create package meta-data objects
- theTestmodelPackage.createPackageContents();
-
- // Initialize created meta-data
- theTestmodelPackage.initializePackageContents();
-
- // Mark meta-data to indicate it can't be changed
- theTestmodelPackage.freeze();
-
- // Update the registry and return the package
- EPackage.Registry.INSTANCE.put(TestmodelPackage.eNS_URI, theTestmodelPackage);
- return theTestmodelPackage;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTestElement() {
- return testElementEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTestElement_Name() {
- return (EAttribute) testElementEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTestElement_Strings() {
- return (EAttribute) testElementEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_References() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ContainedElements() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_Reference() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(4);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ContainedElement() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(5);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_OtherReference() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(6);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTestElement_Description() {
- return (EAttribute) testElementEClass.getEStructuralFeatures().get(7);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_Container() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_SrefContainer() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(9);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ElementMap() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(10);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_StringToStringMap() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(11);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ElementToStringMap() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(12);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_StringToElementMap() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(13);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_NonContained_NTo1() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(14);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_NonContained_1ToN() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(15);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_NonContained_NToM() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(16);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_NonContained_MToN() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(17);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ContainedElements2() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(18);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_Container2() {
- return (EReference) testElementEClass.getEStructuralFeatures().get(19);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ContainedElements_NoOpposite()
- {
- return (EReference) testElementEClass.getEStructuralFeatures().get(20);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_ContainedElement_NoOpposite()
- {
- return (EReference) testElementEClass.getEStructuralFeatures().get(21);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTestElement_FeatureMapEntries()
- {
- return (EAttribute) testElementEClass.getEStructuralFeatures().get(22);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_FeatureMapReferences1()
- {
- return (EReference) testElementEClass.getEStructuralFeatures().get(23);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElement_FeatureMapReferences2()
- {
- return (EReference) testElementEClass.getEStructuralFeatures().get(24);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTestElementToStringMap() {
- return testElementToStringMapEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTestElementToStringMap_Value() {
- return (EAttribute) testElementToStringMapEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElementToStringMap_Key() {
- return (EReference) testElementToStringMapEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getStringToStringMap() {
- return stringToStringMapEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getStringToStringMap_Key() {
- return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getStringToStringMap_Value() {
- return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTestElementToTestElementMap() {
- return testElementToTestElementMapEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElementToTestElementMap_Value() {
- return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTestElementToTestElementMap_Key() {
- return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getStringToTestElementMap() {
- return stringToTestElementMapEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getStringToTestElementMap_Value() {
- return (EReference) stringToTestElementMapEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getStringToTestElementMap_Key() {
- return (EAttribute) stringToTestElementMapEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTestType()
- {
- return testTypeEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTestType_Name()
- {
- return (EAttribute) testTypeEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTypeWithFeatureMapNonContainment()
- {
- return typeWithFeatureMapNonContainmentEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTypeWithFeatureMapNonContainment_Map()
- {
- return (EAttribute) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTypeWithFeatureMapNonContainment_FirstKey()
- {
- return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTypeWithFeatureMapNonContainment_SecondKey()
- {
- return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EClass getTypeWithFeatureMapContainment()
- {
- return typeWithFeatureMapContainmentEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EAttribute getTypeWithFeatureMapContainment_MapContainment()
- {
- return (EAttribute) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(0);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTypeWithFeatureMapContainment_FirstKeyContainment()
- {
- return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(1);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public EReference getTypeWithFeatureMapContainment_SecondKeyContainment()
- {
- return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(2);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestmodelFactory getTestmodelFactory() {
- return (TestmodelFactory) getEFactoryInstance();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isCreated = false;
-
- /**
- * Creates the meta-model objects for the package. This method is
- * guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void createPackageContents() {
- if (isCreated)
- return;
- isCreated = true;
-
- // Create classes and their features
- testElementEClass = createEClass(TEST_ELEMENT);
- createEAttribute(testElementEClass, TEST_ELEMENT__NAME);
- createEAttribute(testElementEClass, TEST_ELEMENT__STRINGS);
- createEReference(testElementEClass, TEST_ELEMENT__REFERENCES);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS);
- createEReference(testElementEClass, TEST_ELEMENT__REFERENCE);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT);
- createEReference(testElementEClass, TEST_ELEMENT__OTHER_REFERENCE);
- createEAttribute(testElementEClass, TEST_ELEMENT__DESCRIPTION);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINER);
- createEReference(testElementEClass, TEST_ELEMENT__SREF_CONTAINER);
- createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_MAP);
- createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_STRING_MAP);
- createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_TO_STRING_MAP);
- createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_ELEMENT_MAP);
- createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO1);
- createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_1TO_N);
- createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO_M);
- createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_MTO_N);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS2);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINER2);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);
- createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE);
- createEAttribute(testElementEClass, TEST_ELEMENT__FEATURE_MAP_ENTRIES);
- createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES1);
- createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES2);
-
- testElementToStringMapEClass = createEClass(TEST_ELEMENT_TO_STRING_MAP);
- createEAttribute(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__VALUE);
- createEReference(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__KEY);
-
- stringToStringMapEClass = createEClass(STRING_TO_STRING_MAP);
- createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__KEY);
- createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__VALUE);
-
- testElementToTestElementMapEClass = createEClass(TEST_ELEMENT_TO_TEST_ELEMENT_MAP);
- createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE);
- createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY);
-
- stringToTestElementMapEClass = createEClass(STRING_TO_TEST_ELEMENT_MAP);
- createEReference(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__VALUE);
- createEAttribute(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__KEY);
-
- testTypeEClass = createEClass(TEST_TYPE);
- createEAttribute(testTypeEClass, TEST_TYPE__NAME);
-
- typeWithFeatureMapNonContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT);
- createEAttribute(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
- createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY);
- createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY);
-
- typeWithFeatureMapContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_CONTAINMENT);
- createEAttribute(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
- createEReference(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
- createEReference(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- private boolean isInitialized = false;
-
- /**
- * Complete the initialization of the package and its meta-model. This
- * method is guarded to have no affect on any invocation but its first.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public void initializePackageContents() {
- if (isInitialized)
- return;
- isInitialized = true;
-
- // Initialize package
- setName(eNAME);
- setNsPrefix(eNS_PREFIX);
- setNsURI(eNS_URI);
-
- // Create type parameters
-
- // Set bounds for type parameters
-
- // Add supertypes to classes
- testElementEClass.getESuperTypes().add(ecorePackage.getEObject());
- typeWithFeatureMapNonContainmentEClass.getESuperTypes().add(this.getTestType());
- typeWithFeatureMapContainmentEClass.getESuperTypes().add(this.getTestType());
-
- // Initialize classes and features; add operations and parameters
- initEClass(testElementEClass, TestElement.class,
- "TestElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTestElement_Name(),
- ecorePackage.getEString(),
- "name", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestElement_Strings(),
- ecorePackage.getEString(),
- "strings", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_References(),
- this.getTestElement(),
- null,
- "references", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ContainedElements(),
- this.getTestElement(),
- this.getTestElement_Container(),
- "containedElements", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_Reference(),
- this.getTestElement(),
- null,
- "reference", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ContainedElement(),
- this.getTestElement(),
- this.getTestElement_SrefContainer(),
- "containedElement", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_OtherReference(),
- this.getTestElement(),
- null,
- "otherReference", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestElement_Description(),
- ecorePackage.getEString(),
- "description", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_Container(),
- this.getTestElement(),
- this.getTestElement_ContainedElements(),
- "container", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_SrefContainer(),
- this.getTestElement(),
- this.getTestElement_ContainedElement(),
- "srefContainer", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ElementMap(),
- this.getTestElementToTestElementMap(),
- null,
- "elementMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_StringToStringMap(),
- this.getStringToStringMap(),
- null,
- "stringToStringMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ElementToStringMap(),
- this.getTestElementToStringMap(),
- null,
- "elementToStringMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_StringToElementMap(),
- this.getStringToTestElementMap(),
- null,
- "stringToElementMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_NonContained_NTo1(),
- this.getTestElement(),
- this.getTestElement_NonContained_1ToN(),
- "nonContained_NTo1", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_NonContained_1ToN(),
- this.getTestElement(),
- this.getTestElement_NonContained_NTo1(),
- "nonContained_1ToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_NonContained_NToM(),
- this.getTestElement(),
- this.getTestElement_NonContained_MToN(),
- "nonContained_NToM", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_NonContained_MToN(),
- this.getTestElement(),
- this.getTestElement_NonContained_NToM(),
- "nonContained_MToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ContainedElements2(),
- this.getTestElement(),
- this.getTestElement_Container2(),
- "containedElements2", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_Container2(),
- this.getTestElement(),
- this.getTestElement_ContainedElements2(),
- "container2", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ContainedElements_NoOpposite(),
- this.getTestElement(),
- null,
- "containedElements_NoOpposite", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_ContainedElement_NoOpposite(),
- this.getTestElement(),
- null,
- "containedElement_NoOpposite", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getTestElement_FeatureMapEntries(),
- ecorePackage.getEFeatureMapEntry(),
- "featureMapEntries", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_FeatureMapReferences1(),
- this.getTestElement(),
- null,
- "featureMapReferences1", null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElement_FeatureMapReferences2(),
- this.getTestElement(),
- null,
- "featureMapReferences2", null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(testElementToStringMapEClass, Map.Entry.class,
- "TestElementToStringMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTestElementToStringMap_Value(),
- ecorePackage.getEString(),
- "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElementToStringMap_Key(),
- this.getTestElement(),
- null,
- "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(stringToStringMapEClass, Map.Entry.class,
- "StringToStringMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getStringToStringMap_Key(),
- ecorePackage.getEString(),
- "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getStringToStringMap_Value(),
- ecorePackage.getEString(),
- "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(testElementToTestElementMapEClass, Map.Entry.class,
- "TestElementToTestElementMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getTestElementToTestElementMap_Value(),
- this.getTestElement(),
- null,
- "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTestElementToTestElementMap_Key(),
- this.getTestElement(),
- null,
- "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(stringToTestElementMapEClass, Map.Entry.class,
- "StringToTestElementMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEReference(
- getStringToTestElementMap_Value(),
- this.getTestElement(),
- null,
- "value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEAttribute(
- getStringToTestElementMap_Key(),
- ecorePackage.getEString(),
- "key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(testTypeEClass, TestType.class, "TestType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTestType_Name(),
- ecorePackage.getEString(),
- "name", null, 0, 1, TestType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(typeWithFeatureMapNonContainmentEClass, TypeWithFeatureMapNonContainment.class,
- "TypeWithFeatureMapNonContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTypeWithFeatureMapNonContainment_Map(),
- ecorePackage.getEFeatureMapEntry(),
- "map", null, 0, -1, TypeWithFeatureMapNonContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTypeWithFeatureMapNonContainment_FirstKey(),
- this.getTestType(),
- null,
- "firstKey", null, 0, -1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTypeWithFeatureMapNonContainment_SecondKey(),
- this.getTestType(),
- null,
- "secondKey", null, 0, -1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- initEClass(typeWithFeatureMapContainmentEClass, TypeWithFeatureMapContainment.class,
- "TypeWithFeatureMapContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
- initEAttribute(
- getTypeWithFeatureMapContainment_MapContainment(),
- ecorePackage.getEFeatureMapEntry(),
- "mapContainment", null, 0, -1, TypeWithFeatureMapContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTypeWithFeatureMapContainment_FirstKeyContainment(),
- this.getTestType(),
- null,
- "firstKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
- initEReference(
- getTypeWithFeatureMapContainment_SecondKeyContainment(),
- this.getTestType(),
- null,
- "secondKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-
- // Create resource
- createResource(eNS_URI);
-
- // Create annotations
- // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
- createExtendedMetaDataAnnotations();
- }
-
- /**
- * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected void createExtendedMetaDataAnnotations()
- {
- String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
- addAnnotation(getTestElement_FeatureMapEntries(),
- source,
- new String[]
- { "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTestElement_FeatureMapReferences1(),
- source,
- new String[]
- { "group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTestElement_FeatureMapReferences2(),
- source,
- new String[]
- { "group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTypeWithFeatureMapNonContainment_Map(),
- source,
- new String[]
- { "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTypeWithFeatureMapNonContainment_FirstKey(),
- source,
- new String[]
- { "group", "#map" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTypeWithFeatureMapNonContainment_SecondKey(),
- source,
- new String[]
- { "group", "#map" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTypeWithFeatureMapContainment_MapContainment(),
- source,
- new String[]
- { "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTypeWithFeatureMapContainment_FirstKeyContainment(),
- source,
- new String[]
- { "group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$
- });
- addAnnotation(getTypeWithFeatureMapContainment_SecondKeyContainment(),
- source,
- new String[]
- { "group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$
- });
- }
-
-} // TestmodelPackageImpl
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class TestmodelPackageImpl extends EPackageImpl implements TestmodelPackage {
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass testElementEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass testElementToStringMapEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass stringToStringMapEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass testElementToTestElementMapEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass stringToTestElementMapEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass testTypeEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass typeWithFeatureMapNonContainmentEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private EClass typeWithFeatureMapContainmentEClass = null;
+
+ /**
+ * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
+ * EPackage.Registry} by the package
+ * package URI value.
+ * <p>
+ * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
+ * performs initialization of the package, or returns the registered package, if one already exists. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.ecore.EPackage.Registry
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#eNS_URI
+ * @see #init()
+ * @generated
+ */
+ private TestmodelPackageImpl() {
+ super(eNS_URI, TestmodelFactory.eINSTANCE);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private static boolean isInited = false;
+
+ /**
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>
+ * This method is used to initialize {@link TestmodelPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+ * <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ *
+ * @see #eNS_URI
+ * @see #createPackageContents()
+ * @see #initializePackageContents()
+ * @generated
+ */
+ public static TestmodelPackage init() {
+ if (isInited) {
+ return (TestmodelPackage) EPackage.Registry.INSTANCE.getEPackage(TestmodelPackage.eNS_URI);
+ }
+
+ // Obtain or create and register package
+ final TestmodelPackageImpl theTestmodelPackage = (TestmodelPackageImpl) (EPackage.Registry.INSTANCE
+ .get(eNS_URI) instanceof TestmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+ : new TestmodelPackageImpl());
+
+ isInited = true;
+
+ // Create package meta-data objects
+ theTestmodelPackage.createPackageContents();
+
+ // Initialize created meta-data
+ theTestmodelPackage.initializePackageContents();
+
+ // Mark meta-data to indicate it can't be changed
+ theTestmodelPackage.freeze();
+
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(TestmodelPackage.eNS_URI, theTestmodelPackage);
+ return theTestmodelPackage;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getTestElement() {
+ return testElementEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTestElement_Name() {
+ return (EAttribute) testElementEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTestElement_Strings() {
+ return (EAttribute) testElementEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_References() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ContainedElements() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(3);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_Reference() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(4);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ContainedElement() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_OtherReference() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(6);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTestElement_Description() {
+ return (EAttribute) testElementEClass.getEStructuralFeatures().get(7);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_Container() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(8);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_SrefContainer() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(9);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ElementMap() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(10);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_StringToStringMap() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(11);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ElementToStringMap() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(12);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_StringToElementMap() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(13);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_NonContained_NTo1() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(14);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_NonContained_1ToN() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(15);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_NonContained_NToM() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(16);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_NonContained_MToN() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(17);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ContainedElements2() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(18);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_Container2() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(19);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ContainedElements_NoOpposite() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(20);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_ContainedElement_NoOpposite() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(21);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTestElement_FeatureMapEntries() {
+ return (EAttribute) testElementEClass.getEStructuralFeatures().get(22);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_FeatureMapReferences1() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(23);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElement_FeatureMapReferences2() {
+ return (EReference) testElementEClass.getEStructuralFeatures().get(24);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getTestElementToStringMap() {
+ return testElementToStringMapEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTestElementToStringMap_Value() {
+ return (EAttribute) testElementToStringMapEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElementToStringMap_Key() {
+ return (EReference) testElementToStringMapEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getStringToStringMap() {
+ return stringToStringMapEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getStringToStringMap_Key() {
+ return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getStringToStringMap_Value() {
+ return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getTestElementToTestElementMap() {
+ return testElementToTestElementMapEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElementToTestElementMap_Value() {
+ return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTestElementToTestElementMap_Key() {
+ return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getStringToTestElementMap() {
+ return stringToTestElementMapEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getStringToTestElementMap_Value() {
+ return (EReference) stringToTestElementMapEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getStringToTestElementMap_Key() {
+ return (EAttribute) stringToTestElementMapEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getTestType() {
+ return testTypeEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTestType_Name() {
+ return (EAttribute) testTypeEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getTypeWithFeatureMapNonContainment() {
+ return typeWithFeatureMapNonContainmentEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTypeWithFeatureMapNonContainment_Map() {
+ return (EAttribute) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTypeWithFeatureMapNonContainment_FirstKey() {
+ return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTypeWithFeatureMapNonContainment_SecondKey() {
+ return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EClass getTypeWithFeatureMapContainment() {
+ return typeWithFeatureMapContainmentEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EAttribute getTypeWithFeatureMapContainment_MapContainment() {
+ return (EAttribute) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTypeWithFeatureMapContainment_FirstKeyContainment() {
+ return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public EReference getTypeWithFeatureMapContainment_SecondKeyContainment() {
+ return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(2);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestmodelFactory getTestmodelFactory() {
+ return (TestmodelFactory) getEFactoryInstance();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private boolean isCreated = false;
+
+ /**
+ * Creates the meta-model objects for the package. This method is
+ * guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void createPackageContents() {
+ if (isCreated) {
+ return;
+ }
+ isCreated = true;
+
+ // Create classes and their features
+ testElementEClass = createEClass(TEST_ELEMENT);
+ createEAttribute(testElementEClass, TEST_ELEMENT__NAME);
+ createEAttribute(testElementEClass, TEST_ELEMENT__STRINGS);
+ createEReference(testElementEClass, TEST_ELEMENT__REFERENCES);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS);
+ createEReference(testElementEClass, TEST_ELEMENT__REFERENCE);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT);
+ createEReference(testElementEClass, TEST_ELEMENT__OTHER_REFERENCE);
+ createEAttribute(testElementEClass, TEST_ELEMENT__DESCRIPTION);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINER);
+ createEReference(testElementEClass, TEST_ELEMENT__SREF_CONTAINER);
+ createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_MAP);
+ createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_STRING_MAP);
+ createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_TO_STRING_MAP);
+ createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_ELEMENT_MAP);
+ createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO1);
+ createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_1TO_N);
+ createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO_M);
+ createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_MTO_N);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS2);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINER2);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);
+ createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE);
+ createEAttribute(testElementEClass, TEST_ELEMENT__FEATURE_MAP_ENTRIES);
+ createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES1);
+ createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES2);
+
+ testElementToStringMapEClass = createEClass(TEST_ELEMENT_TO_STRING_MAP);
+ createEAttribute(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__VALUE);
+ createEReference(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__KEY);
+
+ stringToStringMapEClass = createEClass(STRING_TO_STRING_MAP);
+ createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__KEY);
+ createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__VALUE);
+
+ testElementToTestElementMapEClass = createEClass(TEST_ELEMENT_TO_TEST_ELEMENT_MAP);
+ createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE);
+ createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY);
+
+ stringToTestElementMapEClass = createEClass(STRING_TO_TEST_ELEMENT_MAP);
+ createEReference(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__VALUE);
+ createEAttribute(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__KEY);
+
+ testTypeEClass = createEClass(TEST_TYPE);
+ createEAttribute(testTypeEClass, TEST_TYPE__NAME);
+
+ typeWithFeatureMapNonContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT);
+ createEAttribute(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
+ createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY);
+ createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY);
+
+ typeWithFeatureMapContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_CONTAINMENT);
+ createEAttribute(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
+ createEReference(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
+ createEReference(typeWithFeatureMapContainmentEClass,
+ TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ private boolean isInitialized = false;
+
+ /**
+ * Complete the initialization of the package and its meta-model. This
+ * method is guarded to have no affect on any invocation but its first.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void initializePackageContents() {
+ if (isInitialized) {
+ return;
+ }
+ isInitialized = true;
+
+ // Initialize package
+ setName(eNAME);
+ setNsPrefix(eNS_PREFIX);
+ setNsURI(eNS_URI);
+
+ // Create type parameters
+
+ // Set bounds for type parameters
+
+ // Add supertypes to classes
+ testElementEClass.getESuperTypes().add(ecorePackage.getEObject());
+ typeWithFeatureMapNonContainmentEClass.getESuperTypes().add(getTestType());
+ typeWithFeatureMapContainmentEClass.getESuperTypes().add(getTestType());
+
+ // Initialize classes and features; add operations and parameters
+ initEClass(testElementEClass, TestElement.class, "TestElement", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, TestElement.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestElement_Strings(), ecorePackage.getEString(), "strings", null, 0, -1, TestElement.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_References(), getTestElement(), null, "references", null, 0, -1, //$NON-NLS-1$
+ TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_ContainedElements(), getTestElement(), getTestElement_Container(),
+ "containedElements", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_Reference(), getTestElement(), null, "reference", null, 0, 1, //$NON-NLS-1$
+ TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_ContainedElement(), getTestElement(), getTestElement_SrefContainer(),
+ "containedElement", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_OtherReference(), getTestElement(), null, "otherReference", null, 0, 1, //$NON-NLS-1$
+ TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, //$NON-NLS-1$
+ TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_Container(), getTestElement(), getTestElement_ContainedElements(),
+ "container", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_SrefContainer(), getTestElement(), getTestElement_ContainedElement(),
+ "srefContainer", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_ElementMap(), getTestElementToTestElementMap(), null, "elementMap", null, 0, //$NON-NLS-1$
+ -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_StringToStringMap(), getStringToStringMap(), null, "stringToStringMap", null, //$NON-NLS-1$
+ 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_ElementToStringMap(), getTestElementToStringMap(), null,
+ "elementToStringMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_StringToElementMap(), getStringToTestElementMap(), null,
+ "stringToElementMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_NonContained_NTo1(), getTestElement(),
+ getTestElement_NonContained_1ToN(), "nonContained_NTo1", null, 0, 1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getTestElement_NonContained_1ToN(), getTestElement(),
+ getTestElement_NonContained_NTo1(), "nonContained_1ToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getTestElement_NonContained_NToM(), getTestElement(),
+ getTestElement_NonContained_MToN(), "nonContained_NToM", null, 0, -1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getTestElement_NonContained_MToN(), getTestElement(),
+ getTestElement_NonContained_NToM(), "nonContained_MToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getTestElement_ContainedElements2(), getTestElement(), getTestElement_Container2(),
+ "containedElements2", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_Container2(), getTestElement(), getTestElement_ContainedElements2(),
+ "container2", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
+ !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_ContainedElements_NoOpposite(), getTestElement(), null,
+ "containedElements_NoOpposite", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_ContainedElement_NoOpposite(), getTestElement(), null,
+ "containedElement_NoOpposite", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+ IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getTestElement_FeatureMapEntries(), ecorePackage.getEFeatureMapEntry(), "featureMapEntries", //$NON-NLS-1$
+ null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+ IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_FeatureMapReferences1(), getTestElement(), null, "featureMapReferences1", //$NON-NLS-1$
+ null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElement_FeatureMapReferences2(), getTestElement(), null, "featureMapReferences2", //$NON-NLS-1$
+ null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+ initEClass(testElementToStringMapEClass, Map.Entry.class, "TestElementToStringMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ !IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestElementToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, //$NON-NLS-1$
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+ IS_ORDERED);
+ initEReference(getTestElementToStringMap_Key(), getTestElement(), null, "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+ !IS_DERIVED, IS_ORDERED);
+
+ initEClass(stringToStringMapEClass, Map.Entry.class, "StringToStringMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ !IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getStringToStringMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStringToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(testElementToTestElementMapEClass, Map.Entry.class, "TestElementToTestElementMap", !IS_ABSTRACT, //$NON-NLS-1$
+ !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getTestElementToTestElementMap_Value(), getTestElement(), null, "value", null, 0, 1, //$NON-NLS-1$
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTestElementToTestElementMap_Key(), getTestElement(), null, "key", null, 0, 1, //$NON-NLS-1$
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(stringToTestElementMapEClass, Map.Entry.class, "StringToTestElementMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ !IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getStringToTestElementMap_Value(), getTestElement(), null, "value", null, 0, 1, //$NON-NLS-1$
+ Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+ !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getStringToTestElementMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+ !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(testTypeEClass, TestType.class, "TestType", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+ IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getTestType_Name(), ecorePackage.getEString(), "name", null, 0, 1, TestType.class, !IS_TRANSIENT, //$NON-NLS-1$
+ !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ initEClass(typeWithFeatureMapNonContainmentEClass, TypeWithFeatureMapNonContainment.class,
+ "TypeWithFeatureMapNonContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getTypeWithFeatureMapNonContainment_Map(), ecorePackage.getEFeatureMapEntry(), "map", null, 0, //$NON-NLS-1$
+ -1, TypeWithFeatureMapNonContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+ !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTypeWithFeatureMapNonContainment_FirstKey(), getTestType(), null, "firstKey", null, 0, //$NON-NLS-1$
+ -1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+ initEReference(getTypeWithFeatureMapNonContainment_SecondKey(), getTestType(), null, "secondKey", null, 0, //$NON-NLS-1$
+ -1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+ IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+ initEClass(typeWithFeatureMapContainmentEClass, TypeWithFeatureMapContainment.class,
+ "TypeWithFeatureMapContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+ initEAttribute(getTypeWithFeatureMapContainment_MapContainment(), ecorePackage.getEFeatureMapEntry(),
+ "mapContainment", null, 0, -1, TypeWithFeatureMapContainment.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTypeWithFeatureMapContainment_FirstKeyContainment(), getTestType(), null,
+ "firstKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getTypeWithFeatureMapContainment_SecondKeyContainment(), getTestType(), null,
+ "secondKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
+ IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+ // Create resource
+ createResource(eNS_URI);
+
+ // Create annotations
+ // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+ createExtendedMetaDataAnnotations();
+ }
+
+ /**
+ * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected void createExtendedMetaDataAnnotations() {
+ final String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
+ addAnnotation(getTestElement_FeatureMapEntries(),
+ source,
+ new String[] {
+ "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTestElement_FeatureMapReferences1(),
+ source,
+ new String[] {
+ "group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTestElement_FeatureMapReferences2(),
+ source,
+ new String[] {
+ "group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTypeWithFeatureMapNonContainment_Map(),
+ source,
+ new String[] {
+ "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTypeWithFeatureMapNonContainment_FirstKey(),
+ source,
+ new String[] {
+ "group", "#map" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTypeWithFeatureMapNonContainment_SecondKey(),
+ source,
+ new String[] {
+ "group", "#map" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTypeWithFeatureMapContainment_MapContainment(),
+ source,
+ new String[] {
+ "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTypeWithFeatureMapContainment_FirstKeyContainment(),
+ source,
+ new String[] {
+ "group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ addAnnotation(getTypeWithFeatureMapContainment_SecondKeyContainment(),
+ source,
+ new String[] {
+ "group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$
+ });
+ }
+
+} // TestmodelPackageImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java
index add6cb4..c4a0b11 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
*/
@@ -30,25 +30,24 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getMapContainment <em>Map
- * Containment</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getFirstKeyContainment <em>
- * First Key Containment</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getSecondKeyContainment <em>
- * Second Key Containment</em>}</li>
- * </ul>
* </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getMapContainment
+ * <em>Map Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getFirstKeyContainment
+ * <em>First Key Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getSecondKeyContainment
+ * <em>Second Key Containment</em>}</li>
+ * </ul>
*
* @generated
*/
-public class TypeWithFeatureMapContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapContainment
-{
+public class TypeWithFeatureMapContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapContainment {
/**
* The cached value of the '{@link #getMapContainment() <em>Map Containment</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getMapContainment()
* @generated
* @ordered
@@ -58,36 +57,32 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- protected TypeWithFeatureMapContainmentImpl()
- {
+ protected TypeWithFeatureMapContainmentImpl() {
super();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- protected EClass eStaticClass()
- {
+ protected EClass eStaticClass() {
return TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public FeatureMap getMapContainment()
- {
- if (mapContainment == null)
- {
+ public FeatureMap getMapContainment() {
+ if (mapContainment == null) {
mapContainment = new BasicFeatureMap(this,
TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
}
@@ -97,38 +92,34 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public EList<TestType> getFirstKeyContainment()
- {
- return getMapContainment().list(
- TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
+ public EList<TestType> getFirstKeyContainment() {
+ return getMapContainment()
+ .list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public EList<TestType> getSecondKeyContainment()
- {
- return getMapContainment().list(
- TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
+ public EList<TestType> getSecondKeyContainment() {
+ return getMapContainment()
+ .list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
return ((InternalEList<?>) getMapContainment()).basicRemove(otherEnd, msgs);
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT:
@@ -142,17 +133,16 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
- if (coreType)
+ if (coreType) {
return getMapContainment();
+ }
return ((FeatureMap.Internal) getMapContainment()).getWrapper();
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT:
return getFirstKeyContainment();
@@ -165,15 +155,13 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
((FeatureMap.Internal) getMapContainment()).set(newValue);
return;
@@ -192,14 +180,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
+ public void eUnset(int featureID) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
getMapContainment().clear();
return;
@@ -216,14 +202,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
return mapContainment != null && !mapContainment.isEmpty();
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT:
@@ -237,16 +221,16 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public String toString()
- {
- if (eIsProxy())
+ public String toString() {
+ if (eIsProxy()) {
return super.toString();
+ }
- StringBuffer result = new StringBuffer(super.toString());
+ final StringBuffer result = new StringBuffer(super.toString());
result.append(" (mapContainment: "); //$NON-NLS-1$
result.append(mapContainment);
result.append(')');
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java
index f539e2c..9debd7d 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java
@@ -1,11 +1,11 @@
/**
* Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
+ *
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* Edgar Mueller - initial API and implementation
*/
@@ -30,24 +30,23 @@
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
+ * </p>
* <ul>
* <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getMap <em>Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getFirstKey <em>First Key
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getSecondKey <em>Second Key
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getFirstKey
+ * <em>First Key</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getSecondKey
+ * <em>Second Key</em>}</li>
* </ul>
- * </p>
*
* @generated
*/
-public class TypeWithFeatureMapNonContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapNonContainment
-{
+public class TypeWithFeatureMapNonContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapNonContainment {
/**
* The cached value of the '{@link #getMap() <em>Map</em>}' attribute list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @see #getMap()
* @generated
* @ordered
@@ -57,36 +56,32 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- protected TypeWithFeatureMapNonContainmentImpl()
- {
+ protected TypeWithFeatureMapNonContainmentImpl() {
super();
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- protected EClass eStaticClass()
- {
+ protected EClass eStaticClass() {
return TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT;
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public FeatureMap getMap()
- {
- if (map == null)
- {
+ public FeatureMap getMap() {
+ if (map == null) {
map = new BasicFeatureMap(this, TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
}
return map;
@@ -95,36 +90,32 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public EList<TestType> getFirstKey()
- {
+ public EList<TestType> getFirstKey() {
return getMap().list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
- public EList<TestType> getSecondKey()
- {
+ public EList<TestType> getSecondKey() {
return getMap().list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY);
}
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
- {
- switch (featureID)
- {
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
return ((InternalEList<?>) getMap()).basicRemove(otherEnd, msgs);
}
@@ -134,17 +125,16 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public Object eGet(int featureID, boolean resolve, boolean coreType)
- {
- switch (featureID)
- {
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
- if (coreType)
+ if (coreType) {
return getMap();
+ }
return ((FeatureMap.Internal) getMap()).getWrapper();
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY:
return getFirstKey();
@@ -157,15 +147,13 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@SuppressWarnings("unchecked")
@Override
- public void eSet(int featureID, Object newValue)
- {
- switch (featureID)
- {
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
((FeatureMap.Internal) getMap()).set(newValue);
return;
@@ -184,14 +172,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public void eUnset(int featureID)
- {
- switch (featureID)
- {
+ public void eUnset(int featureID) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
getMap().clear();
return;
@@ -208,14 +194,12 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public boolean eIsSet(int featureID)
- {
- switch (featureID)
- {
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
return map != null && !map.isEmpty();
case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY:
@@ -229,16 +213,16 @@
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- *
+ *
* @generated
*/
@Override
- public String toString()
- {
- if (eIsProxy())
+ public String toString() {
+ if (eIsProxy()) {
return super.toString();
+ }
- StringBuffer result = new StringBuffer(super.toString());
+ final StringBuffer result = new StringBuffer(super.toString());
result.append(" (map: "); //$NON-NLS-1$
result.append(map);
result.append(')');
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java
index e1c778d..0662c82 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java
@@ -1,304 +1,287 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.util;
-
-import java.util.Map;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestType;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
- * @generated
- */
-public class TestmodelAdapterFactory extends AdapterFactoryImpl {
- /**
- * The cached model package.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected static TestmodelPackage modelPackage;
-
- /**
- * Creates an instance of the adapter factory.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestmodelAdapterFactory() {
- if (modelPackage == null)
- {
- modelPackage = TestmodelPackage.eINSTANCE;
- }
- }
-
- /**
- * Returns whether this factory is applicable for the type of the object.
- * <!-- begin-user-doc -->
- * This implementation returns <code>true</code> if the object is either the model's package or is an instance
- * object of the model.
- * <!-- end-user-doc -->
- *
- * @return whether this factory is applicable for the type of the object.
- * @generated
- */
- @Override
- public boolean isFactoryForType(Object object) {
- if (object == modelPackage)
- {
- return true;
- }
- if (object instanceof EObject)
- {
- return ((EObject) object).eClass().getEPackage() == modelPackage;
- }
- return false;
- }
-
- /**
- * The switch that delegates to the <code>createXXX</code> methods.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected TestmodelSwitch<Adapter> modelSwitch =
- new TestmodelSwitch<Adapter>()
- {
- @Override
- public Adapter caseTestElement(TestElement object)
- {
- return createTestElementAdapter();
- }
-
- @Override
- public Adapter caseTestElementToStringMap(Map.Entry<TestElement, String> object)
- {
- return createTestElementToStringMapAdapter();
- }
-
- @Override
- public Adapter caseStringToStringMap(Map.Entry<String, String> object)
- {
- return createStringToStringMapAdapter();
- }
-
- @Override
- public Adapter caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object)
- {
- return createTestElementToTestElementMapAdapter();
- }
-
- @Override
- public Adapter caseStringToTestElementMap(Map.Entry<String, TestElement> object)
- {
- return createStringToTestElementMapAdapter();
- }
-
- @Override
- public Adapter caseTestType(TestType object)
- {
- return createTestTypeAdapter();
- }
-
- @Override
- public Adapter caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object)
- {
- return createTypeWithFeatureMapNonContainmentAdapter();
- }
-
- @Override
- public Adapter caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object)
- {
- return createTypeWithFeatureMapContainmentAdapter();
- }
-
- @Override
- public Adapter defaultCase(EObject object)
- {
- return createEObjectAdapter();
- }
- };
-
- /**
- * Creates an adapter for the <code>target</code>.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @param target the object to adapt.
- * @return the adapter for the <code>target</code>.
- * @generated
- */
- @Override
- public Adapter createAdapter(Notifier target) {
- return modelSwitch.doSwitch((EObject) target);
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestElement
- * <em>Test Element</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.emf.emfstore.test.model.TestElement
- * @generated
- */
- public Adapter createTestElementAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see java.util.Map.Entry
- * @generated
- */
- public Adapter createTestElementToStringMapAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see java.util.Map.Entry
- * @generated
- */
- public Adapter createStringToStringMapAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link java.util.Map.Entry
- * <em>Test Element To Test Element Map</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see java.util.Map.Entry
- * @generated
- */
- public Adapter createTestElementToTestElementMapAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see java.util.Map.Entry
- * @generated
- */
- public Adapter createStringToTestElementMapAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestType
- * <em>Test Type</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.emf.emfstore.test.model.TestType
- * @generated
- */
- public Adapter createTestTypeAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
- * <em>Type With Feature Map Non Containment</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
- * @generated
- */
- public Adapter createTypeWithFeatureMapNonContainmentAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '
- * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
- * <em>Type With Feature Map Containment</em>}'.
- * <!-- begin-user-doc -->
- * This default implementation returns null so that we can easily ignore cases;
- * it's useful to ignore a case when inheritance will catch all the cases anyway.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
- * @generated
- */
- public Adapter createTypeWithFeatureMapContainmentAdapter()
- {
- return null;
- }
-
- /**
- * Creates a new adapter for the default case.
- * <!-- begin-user-doc -->
- * This default implementation returns null.
- * <!-- end-user-doc -->
- *
- * @return the new adapter.
- * @generated
- */
- public Adapter createEObjectAdapter() {
- return null;
- }
-
-} // TestmodelAdapterFactory
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
+ * @generated
+ */
+public class TestmodelAdapterFactory extends AdapterFactoryImpl {
+ /**
+ * The cached model package.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected static TestmodelPackage modelPackage;
+
+ /**
+ * Creates an instance of the adapter factory.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestmodelAdapterFactory() {
+ if (modelPackage == null) {
+ modelPackage = TestmodelPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Returns whether this factory is applicable for the type of the object.
+ * <!-- begin-user-doc -->
+ * This implementation returns <code>true</code> if the object is either the model's package or is an instance
+ * object of the model.
+ * <!-- end-user-doc -->
+ *
+ * @return whether this factory is applicable for the type of the object.
+ * @generated
+ */
+ @Override
+ public boolean isFactoryForType(Object object) {
+ if (object == modelPackage) {
+ return true;
+ }
+ if (object instanceof EObject) {
+ return ((EObject) object).eClass().getEPackage() == modelPackage;
+ }
+ return false;
+ }
+
+ /**
+ * The switch that delegates to the <code>createXXX</code> methods.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected TestmodelSwitch<Adapter> modelSwitch = new TestmodelSwitch<Adapter>() {
+ @Override
+ public Adapter caseTestElement(TestElement object) {
+ return createTestElementAdapter();
+ }
+
+ @Override
+ public Adapter caseTestElementToStringMap(Map.Entry<TestElement, String> object) {
+ return createTestElementToStringMapAdapter();
+ }
+
+ @Override
+ public Adapter caseStringToStringMap(Map.Entry<String, String> object) {
+ return createStringToStringMapAdapter();
+ }
+
+ @Override
+ public Adapter caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object) {
+ return createTestElementToTestElementMapAdapter();
+ }
+
+ @Override
+ public Adapter caseStringToTestElementMap(Map.Entry<String, TestElement> object) {
+ return createStringToTestElementMapAdapter();
+ }
+
+ @Override
+ public Adapter caseTestType(TestType object) {
+ return createTestTypeAdapter();
+ }
+
+ @Override
+ public Adapter caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object) {
+ return createTypeWithFeatureMapNonContainmentAdapter();
+ }
+
+ @Override
+ public Adapter caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object) {
+ return createTypeWithFeatureMapContainmentAdapter();
+ }
+
+ @Override
+ public Adapter defaultCase(EObject object) {
+ return createEObjectAdapter();
+ }
+ };
+
+ /**
+ * Creates an adapter for the <code>target</code>.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @param target the object to adapt.
+ * @return the adapter for the <code>target</code>.
+ * @generated
+ */
+ @Override
+ public Adapter createAdapter(Notifier target) {
+ return modelSwitch.doSwitch((EObject) target);
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestElement
+ * <em>Test Element</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.emfstore.test.model.TestElement
+ * @generated
+ */
+ public Adapter createTestElementAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see java.util.Map.Entry
+ * @generated
+ */
+ public Adapter createTestElementToStringMapAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see java.util.Map.Entry
+ * @generated
+ */
+ public Adapter createStringToStringMapAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+ * <em>Test Element To Test Element Map</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see java.util.Map.Entry
+ * @generated
+ */
+ public Adapter createTestElementToTestElementMapAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see java.util.Map.Entry
+ * @generated
+ */
+ public Adapter createStringToTestElementMapAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestType
+ * <em>Test Type</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.emfstore.test.model.TestType
+ * @generated
+ */
+ public Adapter createTestTypeAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+ * <em>Type With Feature Map Non Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+ * @generated
+ */
+ public Adapter createTypeWithFeatureMapNonContainmentAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for an object of class '
+ * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+ * <em>Type With Feature Map Containment</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+ * @generated
+ */
+ public Adapter createTypeWithFeatureMapContainmentAdapter() {
+ return null;
+ }
+
+ /**
+ * Creates a new adapter for the default case.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null.
+ * <!-- end-user-doc -->
+ *
+ * @return the new adapter.
+ * @generated
+ */
+ public Adapter createEObjectAdapter() {
+ return null;
+ }
+
+} // TestmodelAdapterFactory
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java
index f129cf7..f6833e7 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java
@@ -1,324 +1,326 @@
-/**
- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Edgar Mueller - initial API and implementation
- */
-package org.eclipse.emf.emfstore.test.model.util;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.emfstore.test.model.TestElement;
-import org.eclipse.emf.emfstore.test.model.TestType;
-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each
- * class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- *
- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
- * @generated
- */
-public class TestmodelSwitch<T> {
- /**
- * The cached model package
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- protected static TestmodelPackage modelPackage;
-
- /**
- * Creates an instance of the switch.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @generated
- */
- public TestmodelSwitch() {
- if (modelPackage == null)
- {
- modelPackage = TestmodelPackage.eINSTANCE;
- }
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
- * result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- public T doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
- * result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage)
- {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- }
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ?
- defaultCase(theEObject) :
- doSwitch(eSuperTypes.get(0), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
- * result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- *
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(int classifierID, EObject theEObject) {
- switch (classifierID)
- {
- case TestmodelPackage.TEST_ELEMENT: {
- TestElement testElement = (TestElement) theEObject;
- T result = caseTestElement(testElement);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP: {
- @SuppressWarnings("unchecked")
- Map.Entry<TestElement, String> testElementToStringMap = (Map.Entry<TestElement, String>) theEObject;
- T result = caseTestElementToStringMap(testElementToStringMap);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.STRING_TO_STRING_MAP: {
- @SuppressWarnings("unchecked")
- Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>) theEObject;
- T result = caseStringToStringMap(stringToStringMap);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP: {
- @SuppressWarnings("unchecked")
- Map.Entry<TestElement, TestElement> testElementToTestElementMap = (Map.Entry<TestElement, TestElement>) theEObject;
- T result = caseTestElementToTestElementMap(testElementToTestElementMap);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP: {
- @SuppressWarnings("unchecked")
- Map.Entry<String, TestElement> stringToTestElementMap = (Map.Entry<String, TestElement>) theEObject;
- T result = caseStringToTestElementMap(stringToTestElementMap);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.TEST_TYPE: {
- TestType testType = (TestType) theEObject;
- T result = caseTestType(testType);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT: {
- TypeWithFeatureMapNonContainment typeWithFeatureMapNonContainment = (TypeWithFeatureMapNonContainment) theEObject;
- T result = caseTypeWithFeatureMapNonContainment(typeWithFeatureMapNonContainment);
- if (result == null)
- result = caseTestType(typeWithFeatureMapNonContainment);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT: {
- TypeWithFeatureMapContainment typeWithFeatureMapContainment = (TypeWithFeatureMapContainment) theEObject;
- T result = caseTypeWithFeatureMapContainment(typeWithFeatureMapContainment);
- if (result == null)
- result = caseTestType(typeWithFeatureMapContainment);
- if (result == null)
- result = defaultCase(theEObject);
- return result;
- }
- default:
- return defaultCase(theEObject);
- }
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Test Element</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Test Element</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTestElement(TestElement object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTestElementToStringMap(Map.Entry<TestElement, String> object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>String To String Map</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>String To String Map</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseStringToStringMap(Map.Entry<String, String> object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseStringToTestElementMap(Map.Entry<String, TestElement> object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Test Type</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Test Type</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTestType(TestType object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object)
- {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
- * <!-- begin-user-doc -->
- * This implementation returns null;
- * returning a non-null result will terminate the switch, but this is the last case anyway.
- * <!-- end-user-doc -->
- *
- * @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject)
- * @generated
- */
- public T defaultCase(EObject object) {
- return null;
- }
-
-} // TestmodelSwitch
+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.util;
+
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each
+ * class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ *
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
+ * @generated
+ */
+public class TestmodelSwitch<T> {
+ /**
+ * The cached model package
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected static TestmodelPackage modelPackage;
+
+ /**
+ * Creates an instance of the switch.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public TestmodelSwitch() {
+ if (modelPackage == null) {
+ modelPackage = TestmodelPackage.eINSTANCE;
+ }
+ }
+
+ /**
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @generated
+ */
+ public T doSwitch(EObject theEObject) {
+ return doSwitch(theEObject.eClass(), theEObject);
+ }
+
+ /**
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @generated
+ */
+ protected T doSwitch(EClass theEClass, EObject theEObject) {
+ if (theEClass.eContainer() == modelPackage) {
+ return doSwitch(theEClass.getClassifierID(), theEObject);
+ }
+ final List<EClass> eSuperTypes = theEClass.getESuperTypes();
+ return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+ }
+
+ /**
+ * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+ * result.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ *
+ * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @generated
+ */
+ protected T doSwitch(int classifierID, EObject theEObject) {
+ switch (classifierID) {
+ case TestmodelPackage.TEST_ELEMENT: {
+ final TestElement testElement = (TestElement) theEObject;
+ T result = caseTestElement(testElement);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP: {
+ @SuppressWarnings("unchecked")
+ final Map.Entry<TestElement, String> testElementToStringMap = (Map.Entry<TestElement, String>) theEObject;
+ T result = caseTestElementToStringMap(testElementToStringMap);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.STRING_TO_STRING_MAP: {
+ @SuppressWarnings("unchecked")
+ final Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>) theEObject;
+ T result = caseStringToStringMap(stringToStringMap);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP: {
+ @SuppressWarnings("unchecked")
+ final Map.Entry<TestElement, TestElement> testElementToTestElementMap = (Map.Entry<TestElement, TestElement>) theEObject;
+ T result = caseTestElementToTestElementMap(testElementToTestElementMap);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP: {
+ @SuppressWarnings("unchecked")
+ final Map.Entry<String, TestElement> stringToTestElementMap = (Map.Entry<String, TestElement>) theEObject;
+ T result = caseStringToTestElementMap(stringToTestElementMap);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.TEST_TYPE: {
+ final TestType testType = (TestType) theEObject;
+ T result = caseTestType(testType);
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT: {
+ final TypeWithFeatureMapNonContainment typeWithFeatureMapNonContainment = (TypeWithFeatureMapNonContainment) theEObject;
+ T result = caseTypeWithFeatureMapNonContainment(typeWithFeatureMapNonContainment);
+ if (result == null) {
+ result = caseTestType(typeWithFeatureMapNonContainment);
+ }
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT: {
+ final TypeWithFeatureMapContainment typeWithFeatureMapContainment = (TypeWithFeatureMapContainment) theEObject;
+ T result = caseTypeWithFeatureMapContainment(typeWithFeatureMapContainment);
+ if (result == null) {
+ result = caseTestType(typeWithFeatureMapContainment);
+ }
+ if (result == null) {
+ result = defaultCase(theEObject);
+ }
+ return result;
+ }
+ default:
+ return defaultCase(theEObject);
+ }
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Test Element</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Test Element</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTestElement(TestElement object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTestElementToStringMap(Map.Entry<TestElement, String> object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>String To String Map</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>String To String Map</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseStringToStringMap(Map.Entry<String, String> object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseStringToTestElementMap(Map.Entry<String, TestElement> object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Test Type</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Test Type</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTestType(TestType object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object) {
+ return null;
+ }
+
+ /**
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch, but this is the last case anyway.
+ * <!-- end-user-doc -->
+ *
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+ * @generated
+ */
+ public T defaultCase(EObject object) {
+ return null;
+ }
+
+} // TestmodelSwitch
