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.&lt;br/&gt;
+
+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(&quot;A says: go!&quot;);
  * 	}
  * };
- * 
+ *
  * // B extends A and is ESObserver
  * B b = new B() {
- * 
+ *
  * 	public void say(String ja) {
  * 		System.out.println(&quot;B says: &quot; + ja);
  * 	}
- * 
+ *
  * 	public void foo() {
  * 		System.out.println(&quot;B says: h??&quot;);
  * 	}
  * };
- * 
+ *
  * // B is registered first
  * ObserverBus.register(b);
  * ObserverBus.register(a);
- * 
+ *
  * ObserverBus.notify(A.class).foo();
- * 
+ *
  * ObserverBus.notify(B.class).say(&quot;w00t&quot;);
- * 
+ *
  * // 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_op