Bug 463207 - Fix white-space formatting

Change-Id: I61776f57ec4f748e3abbd9fcee6f2ade2f6540ac
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/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..19408ef 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
@@ -18,14 +18,14 @@
 /**
  * This is the central singleton for the ClientModel edit plugin.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public final class ClientModelEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final ClientModelEditPlugin INSTANCE = new ClientModelEditPlugin();
@@ -33,7 +33,7 @@
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -41,12 +41,11 @@
 	/**
 	 * Create the instance.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ClientModelEditPlugin() {
-		super(new ResourceLocator[]
-		{
+		super(new ResourceLocator[] {
 			CommonEditPlugin.INSTANCE,
 			ServerEditPlugin.INSTANCE,
 		});
@@ -55,7 +54,7 @@
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -67,7 +66,7 @@
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -78,14 +77,14 @@
 	/**
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
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..be4f33a 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
@@ -43,7 +43,7 @@
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -52,7 +52,7 @@
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -68,7 +68,7 @@
 	/**
 	 * This constructs an instance.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelItemProviderAdapterFactory() {
@@ -83,7 +83,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.internal.client.model.Workspace}
 	 * instances.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected WorkspaceItemProvider workspaceItemProvider;
@@ -92,13 +92,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.client.model.Workspace}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createWorkspaceAdapter() {
-		if (workspaceItemProvider == null)
-		{
+		if (workspaceItemProvider == null) {
 			workspaceItemProvider = new WorkspaceItemProvider(this);
 		}
 
@@ -109,7 +108,7 @@
 	 * This keeps track of the one adapter used for all
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo} instances.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ServerInfoItemProvider serverInfoItemProvider;
@@ -118,13 +117,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createServerInfoAdapter() {
-		if (serverInfoItemProvider == null)
-		{
+		if (serverInfoItemProvider == null) {
 			serverInfoItemProvider = new ServerInfoItemProvider(this);
 		}
 
@@ -135,7 +133,7 @@
 	 * This keeps track of the one adapter used for all
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.Usersession} instances.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected UsersessionItemProvider usersessionItemProvider;
@@ -144,13 +142,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.client.model.Usersession}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUsersessionAdapter() {
-		if (usersessionItemProvider == null)
-		{
+		if (usersessionItemProvider == null) {
 			usersessionItemProvider = new UsersessionItemProvider(this);
 		}
 
@@ -161,7 +158,7 @@
 	 * This keeps track of the one adapter used for all
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace} instances.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ProjectSpaceItemProvider projectSpaceItemProvider;
@@ -170,13 +167,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createProjectSpaceAdapter() {
-		if (projectSpaceItemProvider == null)
-		{
+		if (projectSpaceItemProvider == null) {
 			projectSpaceItemProvider = new ProjectSpaceItemProvider(this);
 		}
 
@@ -188,7 +184,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer} instances.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PendingFileTransferItemProvider pendingFileTransferItemProvider;
@@ -201,8 +197,7 @@
 	 */
 	@Override
 	public Adapter createPendingFileTransferAdapter() {
-		if (pendingFileTransferItemProvider == null)
-		{
+		if (pendingFileTransferItemProvider == null) {
 			pendingFileTransferItemProvider = new PendingFileTransferItemProvider(this);
 		}
 
@@ -212,7 +207,7 @@
 	/**
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -222,7 +217,7 @@
 	/**
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -231,7 +226,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -243,7 +238,7 @@
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,16 +248,14 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -273,7 +266,7 @@
 	/**
 	 * This adds a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -283,7 +276,7 @@
 	/**
 	 * This removes a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -294,14 +287,13 @@
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -309,25 +301,20 @@
 	/**
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (workspaceItemProvider != null) {
+		if (workspaceItemProvider != null)
 			workspaceItemProvider.dispose();
-		}
-		if (serverInfoItemProvider != null) {
+		if (serverInfoItemProvider != null)
 			serverInfoItemProvider.dispose();
-		}
-		if (usersessionItemProvider != null) {
+		if (usersessionItemProvider != null)
 			usersessionItemProvider.dispose();
-		}
-		if (projectSpaceItemProvider != null) {
+		if (projectSpaceItemProvider != null)
 			projectSpaceItemProvider.dispose();
-		}
-		if (pendingFileTransferItemProvider != null) {
+		if (pendingFileTransferItemProvider != null)
 			pendingFileTransferItemProvider.dispose();
-		}
 	}
 
 }
\ No newline at end of file
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..054d8f8 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,
@@ -251,18 +238,16 @@
 	 * This adds a property descriptor for the Changed Shared Properties feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	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,
@@ -277,13 +262,12 @@
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
@@ -298,7 +282,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -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,65 +385,50 @@
 	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()));
 	}
 
 	/**
 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		final Object childFeature = feature;
-		final Object childObject = child;
+		Object childFeature = feature;
+		Object childObject = child;
 
-		final boolean qualify =
-			childFeature == ModelPackage.Literals.PROJECT_SPACE__BASE_VERSION ||
-				childFeature == ModelPackage.Literals.PROJECT_SPACE__MERGED_VERSION;
+		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..28a8ceb 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
@@ -43,7 +43,7 @@
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public UsersessionItemProvider(AdapterFactory adapterFactory) {
@@ -53,13 +53,12 @@
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addUsernamePropertyDescriptor(object);
@@ -75,17 +74,16 @@
 	/**
 	 * This adds a property descriptor for the Username feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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,
@@ -98,17 +96,16 @@
 	/**
 	 * This adds a property descriptor for the Password feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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,
@@ -121,17 +118,16 @@
 	/**
 	 * This adds a property descriptor for the Session Id feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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,
@@ -168,18 +162,16 @@
 	/**
 	 * This adds a property descriptor for the Server Info feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	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,
@@ -192,18 +184,16 @@
 	/**
 	 * This adds a property descriptor for the Save Password feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	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,
@@ -219,13 +209,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
@@ -235,7 +224,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -249,7 +238,7 @@
 	/**
 	 * This returns Usersession.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -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:
@@ -302,28 +290,24 @@
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
 	 * that can be created under this object.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	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()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..6878d9f 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
@@ -39,7 +39,6 @@
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	public WorkspaceItemProvider(AdapterFactory adapterFactory) {
@@ -49,13 +48,11 @@
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -68,13 +65,11 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@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);
@@ -85,7 +80,6 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -99,7 +93,6 @@
 	/**
 	 * This returns Workspace.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -110,7 +103,6 @@
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
@@ -129,8 +121,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:
@@ -144,33 +135,25 @@
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
 	 * that can be created under this object.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
 	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()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
 	 * @generated
 	 */
 	@Override
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.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/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/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/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/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/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/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/model/ModelFactory.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelFactory.java
index 7585987..f7ebe82 100644
--- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/ModelFactory.java
@@ -15,7 +15,7 @@
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each non-abstract class of
  * the model. <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage
  * @generated
  */
@@ -23,7 +23,7 @@
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	ModelFactory eINSTANCE = org.eclipse.emf.emfstore.internal.client.model.impl.ModelFactoryImpl.init();
@@ -31,7 +31,7 @@
 	/**
 	 * Returns a new object of class '<em>Workspace</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Workspace</em>'.
 	 * @generated
 	 */
@@ -40,7 +40,7 @@
 	/**
 	 * Returns a new object of class '<em>Server Info</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Server Info</em>'.
 	 * @generated
 	 */
@@ -49,7 +49,7 @@
 	/**
 	 * Returns a new object of class '<em>Usersession</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Usersession</em>'.
 	 * @generated
 	 */
@@ -58,7 +58,7 @@
 	/**
 	 * Returns a new object of class '<em>Project Space</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Project Space</em>'.
 	 * @generated
 	 */
@@ -67,7 +67,7 @@
 	/**
 	 * Returns a new object of class '<em>Pending File Transfer</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Pending File Transfer</em>'.
 	 * @generated
 	 */
@@ -76,7 +76,7 @@
 	/**
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
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..fa3af0b 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
@@ -24,7 +24,7 @@
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.client.model.ModelFactory
  * @model kind="package"
  * @generated
@@ -33,7 +33,7 @@
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNAME = "model"; //$NON-NLS-1$
@@ -41,7 +41,7 @@
 	/**
 	 * The package namespace URI.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://eclipse.org/emf/emfstore/client/model"; //$NON-NLS-1$
@@ -49,7 +49,7 @@
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.emfstore.client.model"; //$NON-NLS-1$
@@ -57,7 +57,7 @@
 	/**
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	ModelPackage eINSTANCE = org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl.init();
@@ -66,7 +66,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl
 	 * <em>Workspace</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getWorkspace()
 	 * @generated
@@ -77,7 +77,7 @@
 	 * The feature id for the '<em><b>Project Spaces</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -87,7 +87,7 @@
 	 * The feature id for the '<em><b>Server Infos</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -97,7 +97,7 @@
 	 * The feature id for the '<em><b>Usersessions</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -116,7 +116,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl
 	 * <em>Server Info</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getServerInfo()
 	 * @generated
@@ -126,7 +126,7 @@
 	/**
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -135,7 +135,7 @@
 	/**
 	 * The feature id for the '<em><b>Url</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -144,7 +144,7 @@
 	/**
 	 * The feature id for the '<em><b>Port</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -164,7 +164,7 @@
 	 * The feature id for the '<em><b>Project Infos</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -201,7 +201,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl
 	 * <em>Usersession</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getUsersession()
 	 * @generated
@@ -211,7 +211,7 @@
 	/**
 	 * The feature id for the '<em><b>Username</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -220,7 +220,7 @@
 	/**
 	 * The feature id for the '<em><b>Password</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -229,7 +229,7 @@
 	/**
 	 * The feature id for the '<em><b>Session Id</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -247,7 +247,7 @@
 	/**
 	 * The feature id for the '<em><b>Server Info</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -256,7 +256,7 @@
 	/**
 	 * The feature id for the '<em><b>Save Password</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -275,7 +275,7 @@
 	 * The feature id for the '<em><b>Changed Properties</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -294,7 +294,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceImpl
 	 * <em>Project Space</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceImpl
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getProjectSpace()
 	 * @generated
@@ -304,7 +304,7 @@
 	/**
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -317,26 +317,29 @@
 	 * @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.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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,139 +348,153 @@
 	 * @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.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @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
 	 * <em>Pending File Transfer</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl
 	 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getPendingFileTransfer()
 	 * @generated
@@ -488,7 +505,7 @@
 	 * The feature id for the '<em><b>Attachment Id</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -497,7 +514,7 @@
 	/**
 	 * The feature id for the '<em><b>File Version</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -506,7 +523,7 @@
 	/**
 	 * The feature id for the '<em><b>Chunk Number</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -515,7 +532,7 @@
 	/**
 	 * The feature id for the '<em><b>Upload</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -524,7 +541,7 @@
 	/**
 	 * The feature id for the '<em><b>File Name</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -534,7 +551,7 @@
 	 * The feature id for the '<em><b>Preliminary File Name</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -544,7 +561,7 @@
 	 * The number of structural features of the '<em>Pending File Transfer</em>' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -554,7 +571,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.client.model.Workspace
 	 * <em>Workspace</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Workspace</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Workspace
 	 * @generated
@@ -601,7 +618,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo
 	 * <em>Server Info</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Server Info</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ServerInfo
 	 * @generated
@@ -612,7 +629,7 @@
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getName()
 	 * @see #getServerInfo()
@@ -624,7 +641,7 @@
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getUrl <em>Url</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Url</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getUrl()
 	 * @see #getServerInfo()
@@ -636,7 +653,7 @@
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getPort <em>Port</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Port</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getPort()
 	 * @see #getServerInfo()
@@ -699,7 +716,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession
 	 * <em>Usersession</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Usersession</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession
 	 * @generated
@@ -710,7 +727,7 @@
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getUsername <em>Username</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Username</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession#getUsername()
 	 * @see #getUsersession()
@@ -722,7 +739,7 @@
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPassword <em>Password</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Password</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession#getPassword()
 	 * @see #getUsersession()
@@ -734,7 +751,7 @@
 	 * Returns the meta object for the reference '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getSessionId <em>Session Id</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Session Id</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession#getSessionId()
 	 * @see #getUsersession()
@@ -747,7 +764,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPersistentPassword
 	 * <em>Persistent Password</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Persistent Password</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession#getPersistentPassword()
 	 * @see #getUsersession()
@@ -784,7 +801,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getACUser <em>AC User</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>AC User</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession#getACUser()
 	 * @see #getUsersession()
@@ -809,7 +826,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace
 	 * <em>Project Space</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Project Space</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace
 	 * @generated
@@ -821,7 +838,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProject <em>Project</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Project</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProject()
 	 * @see #getProjectSpace()
@@ -834,7 +851,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProjectId <em>Project Id</em>}'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Project Id</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProjectId()
 	 * @see #getProjectSpace()
@@ -859,7 +876,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProjectDescription
 	 * <em>Project Description</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Project Description</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProjectDescription()
 	 * @see #getProjectSpace()
@@ -920,7 +937,7 @@
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#isDirty <em>Dirty</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Dirty</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#isDirty()
 	 * @see #getProjectSpace()
@@ -959,7 +976,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProperties <em>Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Properties</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getProperties()
 	 * @see #getProjectSpace()
@@ -973,7 +990,7 @@
 	 * <em>Changed Shared Properties</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>Changed Shared Properties</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getChangedSharedProperties()
 	 * @see #getProjectSpace()
@@ -986,7 +1003,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getWorkspace <em>Workspace</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the container reference '<em>Workspace</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getWorkspace()
 	 * @see #getProjectSpace()
@@ -1000,7 +1017,7 @@
 	 * <em>Local Change Package</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Local Change Package</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getLocalChangePackage()
 	 * @see #getProjectSpace()
@@ -1013,7 +1030,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getMergedVersion <em>Merged Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Merged Version</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getMergedVersion()
 	 * @see #getProjectSpace()
@@ -1025,7 +1042,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer
 	 * <em>Pending File Transfer</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Pending File Transfer</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer
 	 * @generated
@@ -1076,7 +1093,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#isUpload <em>Upload</em>}'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Upload</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#isUpload()
 	 * @see #getPendingFileTransfer()
@@ -1101,7 +1118,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getPreliminaryFileName
 	 * <em>Preliminary File Name</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Preliminary File Name</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getPreliminaryFileName()
 	 * @see #getPendingFileTransfer()
@@ -1112,7 +1129,7 @@
 	/**
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1127,7 +1144,7 @@
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -1135,7 +1152,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl
 		 * <em>Workspace</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getWorkspace()
 		 * @generated
@@ -1170,7 +1187,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl
 		 * <em>Server Info</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ServerInfoImpl
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getServerInfo()
 		 * @generated
@@ -1181,7 +1198,7 @@
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute SERVER_INFO__NAME = eINSTANCE.getServerInfo_Name();
@@ -1190,7 +1207,7 @@
 		 * The meta object literal for the '<em><b>Url</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute SERVER_INFO__URL = eINSTANCE.getServerInfo_Url();
@@ -1199,7 +1216,7 @@
 		 * The meta object literal for the '<em><b>Port</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute SERVER_INFO__PORT = eINSTANCE.getServerInfo_Port();
@@ -1225,7 +1242,7 @@
 		 * The meta object literal for the '<em><b>Last Usersession</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference SERVER_INFO__LAST_USERSESSION = eINSTANCE.getServerInfo_LastUsersession();
@@ -1234,7 +1251,7 @@
 		 * The meta object literal for the '<em><b>Certificate Alias</b></em>' attribute feature.
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute SERVER_INFO__CERTIFICATE_ALIAS = eINSTANCE.getServerInfo_CertificateAlias();
@@ -1243,7 +1260,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl
 		 * <em>Usersession</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.UsersessionImpl
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getUsersession()
 		 * @generated
@@ -1254,7 +1271,7 @@
 		 * The meta object literal for the '<em><b>Username</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute USERSESSION__USERNAME = eINSTANCE.getUsersession_Username();
@@ -1263,7 +1280,7 @@
 		 * The meta object literal for the '<em><b>Password</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute USERSESSION__PASSWORD = eINSTANCE.getUsersession_Password();
@@ -1272,7 +1289,7 @@
 		 * The meta object literal for the '<em><b>Session Id</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference USERSESSION__SESSION_ID = eINSTANCE.getUsersession_SessionId();
@@ -1281,7 +1298,7 @@
 		 * The meta object literal for the '<em><b>Persistent Password</b></em>' attribute feature.
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute USERSESSION__PERSISTENT_PASSWORD = eINSTANCE.getUsersession_PersistentPassword();
@@ -1290,7 +1307,7 @@
 		 * The meta object literal for the '<em><b>Server Info</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference USERSESSION__SERVER_INFO = eINSTANCE.getUsersession_ServerInfo();
@@ -1299,7 +1316,7 @@
 		 * The meta object literal for the '<em><b>Save Password</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute USERSESSION__SAVE_PASSWORD = eINSTANCE.getUsersession_SavePassword();
@@ -1308,7 +1325,7 @@
 		 * The meta object literal for the '<em><b>AC User</b></em>' containment reference feature.
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference USERSESSION__AC_USER = eINSTANCE.getUsersession_ACUser();
@@ -1325,7 +1342,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceImpl
 		 * <em>Project Space</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceImpl
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getProjectSpace()
 		 * @generated
@@ -1336,7 +1353,7 @@
 		 * The meta object literal for the '<em><b>Project</b></em>' containment reference feature.
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__PROJECT = eINSTANCE.getProjectSpace_Project();
@@ -1353,7 +1370,7 @@
 		 * The meta object literal for the '<em><b>Project Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROJECT_SPACE__PROJECT_NAME = eINSTANCE.getProjectSpace_ProjectName();
@@ -1362,7 +1379,7 @@
 		 * The meta object literal for the '<em><b>Project Description</b></em>' attribute feature.
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROJECT_SPACE__PROJECT_DESCRIPTION = eINSTANCE.getProjectSpace_ProjectDescription();
@@ -1371,7 +1388,7 @@
 		 * The meta object literal for the '<em><b>Usersession</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__USERSESSION = eINSTANCE.getProjectSpace_Usersession();
@@ -1380,7 +1397,7 @@
 		 * The meta object literal for the '<em><b>Last Updated</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROJECT_SPACE__LAST_UPDATED = eINSTANCE.getProjectSpace_LastUpdated();
@@ -1397,7 +1414,7 @@
 		 * The meta object literal for the '<em><b>Resource Count</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROJECT_SPACE__RESOURCE_COUNT = eINSTANCE.getProjectSpace_ResourceCount();
@@ -1406,7 +1423,7 @@
 		 * The meta object literal for the '<em><b>Dirty</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROJECT_SPACE__DIRTY = eINSTANCE.getProjectSpace_Dirty();
@@ -1431,7 +1448,7 @@
 		 * The meta object literal for the '<em><b>Properties</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__PROPERTIES = eINSTANCE.getProjectSpace_Properties();
@@ -1440,7 +1457,7 @@
 		 * The meta object literal for the '<em><b>Changed Shared Properties</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__CHANGED_SHARED_PROPERTIES = eINSTANCE.getProjectSpace_ChangedSharedProperties();
@@ -1449,7 +1466,7 @@
 		 * The meta object literal for the '<em><b>Workspace</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__WORKSPACE = eINSTANCE.getProjectSpace_Workspace();
@@ -1458,7 +1475,7 @@
 		 * The meta object literal for the '<em><b>Local Change Package</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__LOCAL_CHANGE_PACKAGE = eINSTANCE.getProjectSpace_LocalChangePackage();
@@ -1467,7 +1484,7 @@
 		 * The meta object literal for the '<em><b>Merged Version</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT_SPACE__MERGED_VERSION = eINSTANCE.getProjectSpace_MergedVersion();
@@ -1477,7 +1494,7 @@
 		 * {@link org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl
 		 * <em>Pending File Transfer</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.PendingFileTransferImpl
 		 * @see org.eclipse.emf.emfstore.internal.client.model.impl.ModelPackageImpl#getPendingFileTransfer()
 		 * @generated
@@ -1496,7 +1513,7 @@
 		 * The meta object literal for the '<em><b>File Version</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PENDING_FILE_TRANSFER__FILE_VERSION = eINSTANCE.getPendingFileTransfer_FileVersion();
@@ -1505,7 +1522,7 @@
 		 * The meta object literal for the '<em><b>Chunk Number</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PENDING_FILE_TRANSFER__CHUNK_NUMBER = eINSTANCE.getPendingFileTransfer_ChunkNumber();
@@ -1514,7 +1531,7 @@
 		 * The meta object literal for the '<em><b>Upload</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PENDING_FILE_TRANSFER__UPLOAD = eINSTANCE.getPendingFileTransfer_Upload();
@@ -1523,7 +1540,7 @@
 		 * The meta object literal for the '<em><b>File Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PENDING_FILE_TRANSFER__FILE_NAME = eINSTANCE.getPendingFileTransfer_FileName();
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..54f6dd4 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
@@ -44,7 +46,7 @@
 	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Attachment Id</em>' containment reference.
 	 * @see #setAttachmentId(ModelElementId)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer_AttachmentId()
@@ -58,7 +60,7 @@
 	 * <em>Attachment Id</em>}' containment reference.
 	 * <!-- begin-user-doc --> A null value indicates that the transfer
 	 * is to be cancelled. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Attachment Id</em>' containment reference.
 	 * @see #getAttachmentId()
 	 * @generated
@@ -73,7 +75,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>File Version</em>' attribute.
 	 * @see #setFileVersion(int)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer_FileVersion()
@@ -86,7 +88,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getFileVersion
 	 * <em>File Version</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>File Version</em>' attribute.
 	 * @see #getFileVersion()
 	 * @generated
@@ -101,7 +103,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Chunk Number</em>' attribute.
 	 * @see #setChunkNumber(int)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer_ChunkNumber()
@@ -114,7 +116,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getChunkNumber
 	 * <em>Chunk Number</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Chunk Number</em>' attribute.
 	 * @see #getChunkNumber()
 	 * @generated
@@ -129,7 +131,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Upload</em>' attribute.
 	 * @see #setUpload(boolean)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer_Upload()
@@ -142,7 +144,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#isUpload
 	 * <em>Upload</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Upload</em>' attribute.
 	 * @see #isUpload()
 	 * @generated
@@ -157,7 +159,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>File Name</em>' attribute.
 	 * @see #setFileName(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer_FileName()
@@ -170,7 +172,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getFileName
 	 * <em>File Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>File Name</em>' attribute.
 	 * @see #getFileName()
 	 * @generated
@@ -185,7 +187,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Preliminary File Name</em>' attribute.
 	 * @see #setPreliminaryFileName(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getPendingFileTransfer_PreliminaryFileName()
@@ -199,7 +201,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer#getPreliminaryFileName
 	 * <em>Preliminary File Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Preliminary File Name</em>' attribute.
 	 * @see #getPreliminaryFileName()
 	 * @generated
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..78219a7 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
@@ -435,11 +435,11 @@
 	 * <!-- 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.
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..3c7f18a 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
@@ -50,7 +50,7 @@
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_Name()
@@ -63,7 +63,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getName <em>Name</em>}'
 	 * attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -77,7 +77,7 @@
 	 * If the meaning of the '<em>Url</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Url</em>' attribute.
 	 * @see #setUrl(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_Url()
@@ -90,7 +90,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getUrl <em>Url</em>}'
 	 * attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Url</em>' attribute.
 	 * @see #getUrl()
 	 * @generated
@@ -104,7 +104,7 @@
 	 * If the meaning of the '<em>Port</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Port</em>' attribute.
 	 * @see #setPort(int)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_Port()
@@ -117,7 +117,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getPort <em>Port</em>}'
 	 * attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Port</em>' attribute.
 	 * @see #getPort()
 	 * @generated
@@ -161,7 +161,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Project Infos</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_ProjectInfos()
 	 * @model containment="true" resolveProxies="true"
@@ -177,7 +177,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Last Usersession</em>' reference.
 	 * @see #setLastUsersession(Usersession)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_LastUsersession()
@@ -190,7 +190,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getLastUsersession
 	 * <em>Last Usersession</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Last Usersession</em>' reference.
 	 * @see #getLastUsersession()
 	 * @generated
@@ -205,7 +205,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Certificate Alias</em>' attribute.
 	 * @see #setCertificateAlias(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getServerInfo_CertificateAlias()
@@ -218,7 +218,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.ServerInfo#getCertificateAlias
 	 * <em>Certificate Alias</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Certificate Alias</em>' attribute.
 	 * @see #getCertificateAlias()
 	 * @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..32c954d 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
@@ -56,7 +57,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Username</em>' attribute.
 	 * @see #setUsername(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_Username()
@@ -69,7 +70,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getUsername
 	 * <em>Username</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Username</em>' attribute.
 	 * @see #getUsername()
 	 * @generated
@@ -84,7 +85,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Password</em>' attribute.
 	 * @see #setPassword(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_Password()
@@ -97,7 +98,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPassword
 	 * <em>Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Password</em>' attribute.
 	 * @see #getPassword()
 	 * @generated
@@ -112,7 +113,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Session Id</em>' reference.
 	 * @see #setSessionId(SessionId)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_SessionId()
@@ -125,7 +126,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getSessionId
 	 * <em>Session Id</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Session Id</em>' reference.
 	 * @see #getSessionId()
 	 * @generated
@@ -140,7 +141,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Persistent Password</em>' attribute.
 	 * @see #setPersistentPassword(String)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_PersistentPassword()
@@ -153,7 +154,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getPersistentPassword
 	 * <em>Persistent Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Persistent Password</em>' attribute.
 	 * @see #getPersistentPassword()
 	 * @generated
@@ -168,7 +169,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Server Info</em>' reference.
 	 * @see #setServerInfo(ServerInfo)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_ServerInfo()
@@ -181,7 +182,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getServerInfo
 	 * <em>Server Info</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Server Info</em>' reference.
 	 * @see #getServerInfo()
 	 * @generated
@@ -196,7 +197,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Save Password</em>' attribute.
 	 * @see #setSavePassword(boolean)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_SavePassword()
@@ -209,7 +210,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#isSavePassword
 	 * <em>Save Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Save Password</em>' attribute.
 	 * @see #isSavePassword()
 	 * @generated
@@ -224,7 +225,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>AC User</em>' containment reference.
 	 * @see #setACUser(ACUser)
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_ACUser()
@@ -237,7 +238,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.client.model.Usersession#getACUser
 	 * <em>AC User</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>AC User</em>' containment reference.
 	 * @see #getACUser()
 	 * @generated
@@ -254,7 +255,7 @@
 	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Changed Properties</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getUsersession_ChangedProperties()
 	 * @model containment="true" resolveProxies="true"
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..53028f4 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
@@ -175,7 +177,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Project Spaces</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage#getWorkspace_ProjectSpaces()
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace#getWorkspace
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/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/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..60da331 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
@@ -297,7 +297,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..777573f 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
@@ -51,7 +51,7 @@
  * @author wesendon
  */
 public class XmlRpcConnectionManager extends AbstractConnectionManager<XmlRpcClientManager> implements
-ConnectionManager {
+	ConnectionManager {
 
 	/**
 	 * {@inheritDoc}
@@ -120,7 +120,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);
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..9273a16 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
@@ -122,8 +122,7 @@
 		checkAndRemoveDuplicateOperations(incomingChanges);
 
 		AbstractChangePackage copiedLocalChangedPackage = ChangePackageUtil.createChangePackage(
-			Configuration.getClientBehavior().useInMemoryChangePackage()
-			);
+			Configuration.getClientBehavior().useInMemoryChangePackage());
 		final ESCloseableIterable<AbstractOperation> operations = getProjectSpace().getLocalChangePackage()
 			.operations();
 		try {
@@ -163,12 +162,12 @@
 		}
 
 		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,
@@ -216,7 +215,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
@@ -250,7 +250,7 @@
 		ModelUtil.logError(MessageFormat
 			.format(
 				Messages.UpdateController_ChangePackagesRemoved
-				+ Messages.UpdateController_PullingUpBaseVersion,
+					+ Messages.UpdateController_PullingUpBaseVersion,
 				baseVersionDelta, baseVersion.getIdentifier(), baseVersion.getIdentifier() + baseVersionDelta));
 		getProjectSpace().save();
 	}
@@ -289,7 +289,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 +298,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/FileDownloadStatus.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/filetransfer/FileDownloadStatus.java
index 28b8dbd..9494948 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
@@ -356,7 +356,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..705d0c1 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
@@ -162,7 +162,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
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..5e03f56 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
@@ -26,7 +26,7 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
@@ -34,20 +34,16 @@
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static ModelFactory init() {
-		try
-		{
-			final ModelFactory theModelFactory = (ModelFactory) EPackage.Registry.INSTANCE
-				.getEFactory(ModelPackage.eNS_URI);
-			if (theModelFactory != null)
-			{
+		try {
+			ModelFactory theModelFactory = (ModelFactory) EPackage.Registry.INSTANCE.getEFactory(ModelPackage.eNS_URI);
+			if (theModelFactory != null) {
 				return theModelFactory;
 			}
-		} catch (final Exception exception)
-		{
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new ModelFactoryImpl();
@@ -57,7 +53,7 @@
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelFactoryImpl() {
@@ -66,13 +62,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID())
-		{
+		switch (eClass.getClassifierID()) {
 		case ModelPackage.WORKSPACE:
 			return createWorkspace();
 		case ModelPackage.SERVER_INFO:
@@ -90,57 +85,57 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Workspace createWorkspace() {
-		final WorkspaceImpl workspace = new WorkspaceImpl();
+		WorkspaceImpl workspace = new WorkspaceImpl();
 		return workspace;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ServerInfo createServerInfo() {
-		final ServerInfoImpl serverInfo = new ServerInfoImpl();
+		ServerInfoImpl serverInfo = new ServerInfoImpl();
 		return serverInfo;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Usersession createUsersession() {
-		final UsersessionImpl usersession = new UsersessionImpl();
+		UsersessionImpl usersession = new UsersessionImpl();
 		return usersession;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ProjectSpace createProjectSpace() {
-		final ProjectSpaceImpl projectSpace = new ProjectSpaceImpl();
+		ProjectSpaceImpl projectSpace = new ProjectSpaceImpl();
 		return projectSpace;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PendingFileTransfer createPendingFileTransfer() {
-		final PendingFileTransferImpl pendingFileTransfer = new PendingFileTransferImpl();
+		PendingFileTransferImpl pendingFileTransfer = new PendingFileTransferImpl();
 		return pendingFileTransfer;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelPackage getModelPackage() {
@@ -149,7 +144,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
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..0c05391 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
@@ -29,14 +29,14 @@
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass workspaceEClass = null;
@@ -44,7 +44,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass serverInfoEClass = null;
@@ -52,7 +52,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass usersessionEClass = null;
@@ -60,7 +60,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass projectSpaceEClass = null;
@@ -68,7 +68,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass pendingFileTransferEClass = null;
@@ -94,33 +94,33 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
+	 * 
 	 * <p>
-	 * This method is used to initialize {@link 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
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static ModelPackage init() {
-		if (isInited) {
+		if (isInited)
 			return (ModelPackage) EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-		}
 
 		// 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());
+		ModelPackageImpl theModelPackage = (ModelPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new ModelPackageImpl());
 
 		isInited = true;
 
@@ -144,7 +144,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getWorkspace() {
@@ -154,7 +154,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getWorkspace_ProjectSpaces() {
@@ -164,7 +164,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getWorkspace_ServerInfos() {
@@ -174,7 +174,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getWorkspace_Usersessions() {
@@ -184,7 +184,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getServerInfo() {
@@ -194,7 +194,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getServerInfo_Name() {
@@ -204,7 +204,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getServerInfo_Url() {
@@ -214,7 +214,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getServerInfo_Port() {
@@ -224,17 +224,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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() {
@@ -244,7 +244,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getServerInfo_LastUsersession() {
@@ -254,7 +254,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getServerInfo_CertificateAlias() {
@@ -264,7 +264,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getUsersession() {
@@ -274,7 +274,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUsersession_Username() {
@@ -284,7 +284,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUsersession_Password() {
@@ -294,7 +294,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getUsersession_SessionId() {
@@ -304,7 +304,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUsersession_PersistentPassword() {
@@ -314,7 +314,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getUsersession_ServerInfo() {
@@ -324,7 +324,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUsersession_SavePassword() {
@@ -334,7 +334,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getUsersession_ACUser() {
@@ -344,7 +344,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getUsersession_ChangedProperties() {
@@ -354,7 +354,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getProjectSpace() {
@@ -364,7 +364,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_Project() {
@@ -374,7 +374,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_ProjectId() {
@@ -384,7 +384,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProjectSpace_ProjectName() {
@@ -394,7 +394,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProjectSpace_ProjectDescription() {
@@ -404,7 +404,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_Usersession() {
@@ -414,7 +414,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProjectSpace_LastUpdated() {
@@ -424,7 +424,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_BaseVersion() {
@@ -434,7 +434,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProjectSpace_ResourceCount() {
@@ -444,7 +444,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProjectSpace_Dirty() {
@@ -454,7 +454,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getProjectSpace_OldLogMessages() {
@@ -464,7 +464,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_WaitingUploads() {
@@ -474,7 +474,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_Properties() {
@@ -484,7 +484,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_ChangedSharedProperties() {
@@ -494,7 +494,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_Workspace() {
@@ -504,7 +504,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_LocalChangePackage() {
@@ -514,7 +514,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProjectSpace_MergedVersion() {
@@ -524,7 +524,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getPendingFileTransfer() {
@@ -534,7 +534,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getPendingFileTransfer_AttachmentId() {
@@ -544,7 +544,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPendingFileTransfer_FileVersion() {
@@ -554,7 +554,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPendingFileTransfer_ChunkNumber() {
@@ -564,7 +564,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPendingFileTransfer_Upload() {
@@ -574,7 +574,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPendingFileTransfer_FileName() {
@@ -584,7 +584,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPendingFileTransfer_PreliminaryFileName() {
@@ -594,7 +594,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelFactory getModelFactory() {
@@ -604,7 +604,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -614,13 +614,12 @@
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -678,7 +677,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -688,13 +687,12 @@
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -703,13 +701,13 @@
 		setNsURI(eNS_URI);
 
 		// Obtain other dependent packages
-		final org.eclipse.emf.emfstore.internal.common.model.ModelPackage theModelPackage_2 = (org.eclipse.emf.emfstore.internal.common.model.ModelPackage) EPackage.Registry.INSTANCE
+		org.eclipse.emf.emfstore.internal.common.model.ModelPackage theModelPackage_2 = (org.eclipse.emf.emfstore.internal.common.model.ModelPackage) EPackage.Registry.INSTANCE
 			.getEPackage(org.eclipse.emf.emfstore.internal.common.model.ModelPackage.eNS_URI);
-		final org.eclipse.emf.emfstore.internal.server.model.ModelPackage theModelPackage_1 = (org.eclipse.emf.emfstore.internal.server.model.ModelPackage) EPackage.Registry.INSTANCE
+		org.eclipse.emf.emfstore.internal.server.model.ModelPackage theModelPackage_1 = (org.eclipse.emf.emfstore.internal.server.model.ModelPackage) EPackage.Registry.INSTANCE
 			.getEPackage(org.eclipse.emf.emfstore.internal.server.model.ModelPackage.eNS_URI);
-		final AccesscontrolPackage theAccesscontrolPackage = (AccesscontrolPackage) EPackage.Registry.INSTANCE
+		AccesscontrolPackage theAccesscontrolPackage = (AccesscontrolPackage) EPackage.Registry.INSTANCE
 			.getEPackage(AccesscontrolPackage.eNS_URI);
-		final VersioningPackage theVersioningPackage = (VersioningPackage) EPackage.Registry.INSTANCE
+		VersioningPackage theVersioningPackage = (VersioningPackage) EPackage.Registry.INSTANCE
 			.getEPackage(VersioningPackage.eNS_URI);
 
 		// Create type parameters
@@ -720,201 +718,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(), this.getProjectSpace(), this.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(), this.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(), this.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(), this.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(), this.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(), this.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(), this.getWorkspace(), this.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/PendingFileTransferImpl.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/impl/PendingFileTransferImpl.java
index e1cd54c..38b47d7 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
  */
@@ -57,7 +57,7 @@
 	 * The default value of the '{@link #getFileVersion() <em>File Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFileVersion()
 	 * @generated
 	 * @ordered
@@ -68,7 +68,7 @@
 	 * The cached value of the '{@link #getFileVersion() <em>File Version</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getFileVersion()
 	 * @generated
 	 * @ordered
@@ -79,7 +79,7 @@
 	 * The default value of the '{@link #getChunkNumber() <em>Chunk Number</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getChunkNumber()
 	 * @generated
 	 * @ordered
@@ -90,7 +90,7 @@
 	 * The cached value of the '{@link #getChunkNumber() <em>Chunk Number</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getChunkNumber()
 	 * @generated
 	 * @ordered
@@ -101,7 +101,7 @@
 	 * The default value of the '{@link #isUpload() <em>Upload</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #isUpload()
 	 * @generated
 	 * @ordered
@@ -112,7 +112,7 @@
 	 * The cached value of the '{@link #isUpload() <em>Upload</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #isUpload()
 	 * @generated
 	 * @ordered
@@ -123,7 +123,7 @@
 	 * The default value of the '{@link #getFileName() <em>File Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getFileName()
 	 * @generated
 	 * @ordered
@@ -134,7 +134,7 @@
 	 * The cached value of the '{@link #getFileName() <em>File Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getFileName()
 	 * @generated
 	 * @ordered
@@ -163,7 +163,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PendingFileTransferImpl() {
@@ -172,7 +172,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,31 +182,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelElementId getAttachmentId() {
-		if (attachmentId != null && attachmentId.eIsProxy())
-		{
-			final InternalEObject oldAttachmentId = (InternalEObject) attachmentId;
+		if (attachmentId != null && attachmentId.eIsProxy()) {
+			InternalEObject oldAttachmentId = (InternalEObject) attachmentId;
 			attachmentId = (ModelElementId) eResolveProxy(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);
+			if (attachmentId != oldAttachmentId) {
+				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);
 				}
-				if (msgs != null) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, oldAttachmentId, attachmentId));
-				}
 			}
 		}
 		return attachmentId;
@@ -214,7 +209,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelElementId basicGetAttachmentId() {
@@ -223,56 +218,48 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetAttachmentId(ModelElementId newAttachmentId, NotificationChain msgs) {
-		final ModelElementId oldAttachmentId = attachmentId;
+		ModelElementId oldAttachmentId = attachmentId;
 		attachmentId = newAttachmentId;
-		if (eNotificationRequired())
-		{
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, oldAttachmentId, newAttachmentId);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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);
-			}
-			if (newAttachmentId != null) {
-				msgs = ((InternalEObject) newAttachmentId).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID, null, msgs);
-			}
+			if (attachmentId != null)
+				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 = basicSetAttachmentId(newAttachmentId, msgs);
-			if (msgs != null) {
+			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));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getFileVersion() {
@@ -281,21 +268,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setFileVersion(int newFileVersion) {
-		final int oldFileVersion = fileVersion;
+		int oldFileVersion = fileVersion;
 		fileVersion = newFileVersion;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__FILE_VERSION,
 				oldFileVersion, fileVersion));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getChunkNumber() {
@@ -304,21 +290,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setChunkNumber(int newChunkNumber) {
-		final int oldChunkNumber = chunkNumber;
+		int oldChunkNumber = chunkNumber;
 		chunkNumber = newChunkNumber;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__CHUNK_NUMBER,
 				oldChunkNumber, chunkNumber));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isUpload() {
@@ -327,21 +312,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setUpload(boolean newUpload) {
-		final boolean oldUpload = upload;
+		boolean oldUpload = upload;
 		upload = newUpload;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__UPLOAD,
-				oldUpload, upload));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__UPLOAD, oldUpload,
+				upload));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getFileName() {
@@ -350,21 +334,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setFileName(String newFileName) {
-		final String oldFileName = fileName;
+		String oldFileName = fileName;
 		fileName = newFileName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__FILE_NAME,
 				oldFileName, fileName));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getPreliminaryFileName() {
@@ -373,27 +356,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setPreliminaryFileName(String newPreliminaryFileName) {
-		final String oldPreliminaryFileName = preliminaryFileName;
+		String oldPreliminaryFileName = preliminaryFileName;
 		preliminaryFileName = newPreliminaryFileName;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET,
-				ModelPackage.PENDING_FILE_TRANSFER__PRELIMINARY_FILE_NAME, oldPreliminaryFileName, preliminaryFileName));
-		}
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, ModelPackage.PENDING_FILE_TRANSFER__PRELIMINARY_FILE_NAME,
+					oldPreliminaryFileName, preliminaryFileName));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
 		}
@@ -402,17 +384,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
-			if (resolve) {
+			if (resolve)
 				return getAttachmentId();
-			}
 			return basicGetAttachmentId();
 		case ModelPackage.PENDING_FILE_TRANSFER__FILE_VERSION:
 			return getFileVersion();
@@ -430,13 +410,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
 			setAttachmentId((ModelElementId) newValue);
 			return;
@@ -461,13 +440,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.PENDING_FILE_TRANSFER__ATTACHMENT_ID:
 			setAttachmentId((ModelElementId) null);
 			return;
@@ -492,13 +470,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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:
@@ -518,16 +495,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fileVersion: "); //$NON-NLS-1$
 		result.append(fileVersion);
 		result.append(", chunkNumber: "); //$NON-NLS-1$
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..ef3d11c 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
@@ -82,7 +82,7 @@
 	/**
 	 * The cached value of the '{@link #getProject() <em>Project</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getProject()
 	 * @generated
 	 * @ordered
@@ -92,7 +92,7 @@
 	/**
 	 * The cached value of the '{@link #getProjectId() <em>Project Id</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getProjectId()
 	 * @generated
 	 * @ordered
@@ -103,7 +103,7 @@
 	 * The default value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getProjectName()
 	 * @generated
 	 * @ordered
@@ -113,7 +113,7 @@
 	/**
 	 * The cached value of the '{@link #getProjectName() <em>Project Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getProjectName()
 	 * @generated
 	 * @ordered
@@ -124,7 +124,7 @@
 	 * The default value of the '{@link #getProjectDescription() <em>Project Description</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getProjectDescription()
 	 * @generated
 	 * @ordered
@@ -135,7 +135,7 @@
 	 * The cached value of the '{@link #getProjectDescription() <em>Project Description</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getProjectDescription()
 	 * @generated
 	 * @ordered
@@ -145,7 +145,7 @@
 	/**
 	 * The cached value of the '{@link #getUsersession() <em>Usersession</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getUsersession()
 	 * @generated
 	 * @ordered
@@ -156,7 +156,7 @@
 	 * The default value of the '{@link #getLastUpdated() <em>Last Updated</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLastUpdated()
 	 * @generated
 	 * @ordered
@@ -166,7 +166,7 @@
 	/**
 	 * The cached value of the '{@link #getLastUpdated() <em>Last Updated</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLastUpdated()
 	 * @generated
 	 * @ordered
@@ -176,7 +176,7 @@
 	/**
 	 * The cached value of the '{@link #getBaseVersion() <em>Base Version</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getBaseVersion()
 	 * @generated
 	 * @ordered
@@ -187,7 +187,7 @@
 	 * The default value of the '{@link #getResourceCount() <em>Resource Count</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getResourceCount()
 	 * @generated
 	 * @ordered
@@ -198,7 +198,7 @@
 	 * The cached value of the '{@link #getResourceCount() <em>Resource Count</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getResourceCount()
 	 * @generated
 	 * @ordered
@@ -208,7 +208,7 @@
 	/**
 	 * The default value of the '{@link #isDirty() <em>Dirty</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isDirty()
 	 * @generated
 	 * @ordered
@@ -218,7 +218,7 @@
 	/**
 	 * The cached value of the '{@link #isDirty() <em>Dirty</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isDirty()
 	 * @generated
 	 * @ordered
@@ -229,7 +229,7 @@
 	 * The cached value of the '{@link #getOldLogMessages() <em>Old Log Messages</em>}' attribute list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getOldLogMessages()
 	 * @generated
 	 * @ordered
@@ -250,7 +250,7 @@
 	/**
 	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getProperties()
 	 * @generated
 	 * @ordered
@@ -262,7 +262,7 @@
 	 * list.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getChangedSharedProperties()
 	 * @generated
 	 * @ordered
@@ -273,7 +273,7 @@
 	 * The cached value of the '{@link #getLocalChangePackage() <em>Local Change Package</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLocalChangePackage()
 	 * @generated
 	 * @ordered
@@ -284,7 +284,7 @@
 	 * The cached value of the '{@link #getMergedVersion() <em>Merged Version</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMergedVersion()
 	 * @generated
 	 * @ordered
@@ -293,7 +293,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ProjectSpaceImpl() {
@@ -302,7 +302,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PrimaryVersionSpec basicGetBaseVersion() {
@@ -311,7 +311,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Project basicGetProject() {
@@ -320,7 +320,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ProjectId basicGetProjectId() {
@@ -329,7 +329,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Usersession basicGetUsersession() {
@@ -339,72 +339,68 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Workspace basicGetWorkspace() {
-		if (eContainerFeatureID() != ModelPackage.PROJECT_SPACE__WORKSPACE) {
+		if (eContainerFeatureID() != ModelPackage.PROJECT_SPACE__WORKSPACE)
 			return null;
-		}
 		return (Workspace) eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBaseVersion(PrimaryVersionSpec newBaseVersion, NotificationChain msgs) {
-		final PrimaryVersionSpec oldBaseVersion = baseVersion;
+		PrimaryVersionSpec oldBaseVersion = baseVersion;
 		baseVersion = newBaseVersion;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.PROJECT_SPACE__BASE_VERSION, oldBaseVersion, newBaseVersion);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetProject(Project newProject, NotificationChain msgs) {
-		final Project oldProject = project;
+		Project oldProject = project;
 		project = newProject;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.PROJECT_SPACE__PROJECT, oldProject, newProject);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetProjectId(ProjectId newProjectId, NotificationChain msgs) {
-		final ProjectId oldProjectId = projectId;
+		ProjectId oldProjectId = projectId;
 		projectId = newProjectId;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.PROJECT_SPACE__PROJECT_ID, oldProjectId, newProjectId);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -412,7 +408,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetWorkspace(Workspace newWorkspace, NotificationChain msgs) {
@@ -423,7 +419,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -438,37 +434,33 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		case ModelPackage.PROJECT_SPACE__PROJECT:
-			if (resolve) {
+			if (resolve)
 				return getProject();
-			}
 			return basicGetProject();
 		case ModelPackage.PROJECT_SPACE__PROJECT_ID:
-			if (resolve) {
+			if (resolve)
 				return getProjectId();
-			}
 			return basicGetProjectId();
 		case ModelPackage.PROJECT_SPACE__PROJECT_NAME:
 			return getProjectName();
 		case ModelPackage.PROJECT_SPACE__PROJECT_DESCRIPTION:
 			return getProjectDescription();
 		case ModelPackage.PROJECT_SPACE__USERSESSION:
-			if (resolve) {
+			if (resolve)
 				return getUsersession();
-			}
 			return basicGetUsersession();
 		case ModelPackage.PROJECT_SPACE__LAST_UPDATED:
 			return getLastUpdated();
 		case ModelPackage.PROJECT_SPACE__BASE_VERSION:
-			if (resolve) {
+			if (resolve)
 				return getBaseVersion();
-			}
 			return basicGetBaseVersion();
 		case ModelPackage.PROJECT_SPACE__RESOURCE_COUNT:
 			return getResourceCount();
@@ -483,19 +475,16 @@
 		case ModelPackage.PROJECT_SPACE__CHANGED_SHARED_PROPERTIES:
 			return getChangedSharedProperties();
 		case ModelPackage.PROJECT_SPACE__WORKSPACE:
-			if (resolve) {
+			if (resolve)
 				return getWorkspace();
-			}
 			return basicGetWorkspace();
 		case ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE:
-			if (resolve) {
+			if (resolve)
 				return getLocalChangePackage();
-			}
 			return basicGetLocalChangePackage();
 		case ModelPackage.PROJECT_SPACE__MERGED_VERSION:
-			if (resolve) {
+			if (resolve)
 				return getMergedVersion();
-			}
 			return basicGetMergedVersion();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -504,16 +493,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 		case ModelPackage.PROJECT_SPACE__WORKSPACE:
-			if (eInternalContainer() != null) {
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			}
 			return basicSetWorkspace((Workspace) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -521,7 +509,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -549,7 +537,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -562,8 +550,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:
@@ -594,7 +582,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -659,7 +647,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -669,7 +657,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -729,28 +717,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PrimaryVersionSpec getBaseVersion() {
 		if (baseVersion != null && baseVersion.eIsProxy()) {
-			final InternalEObject oldBaseVersion = (InternalEObject) baseVersion;
+			InternalEObject oldBaseVersion = (InternalEObject) baseVersion;
 			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);
+				InternalEObject newBaseVersion = (InternalEObject) baseVersion;
+				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) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.PROJECT_SPACE__BASE_VERSION,
 						oldBaseVersion, baseVersion));
-				}
 			}
 		}
 		return baseVersion;
@@ -758,7 +744,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<EMFStoreProperty> getChangedSharedProperties() {
@@ -771,7 +757,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Date getLastUpdated() {
@@ -780,7 +766,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<String> getOldLogMessages() {
@@ -793,28 +779,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Project getProject() {
 		if (project != null && project.eIsProxy()) {
-			final InternalEObject oldProject = (InternalEObject) project;
+			InternalEObject oldProject = (InternalEObject) project;
 			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);
+				InternalEObject newProject = (InternalEObject) project;
+				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);
 				}
-				if (msgs != null) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.PROJECT_SPACE__PROJECT,
 						oldProject, project));
-				}
 			}
 		}
 		return project;
@@ -822,7 +806,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getProjectDescription() {
@@ -831,28 +815,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ProjectId getProjectId() {
 		if (projectId != null && projectId.eIsProxy()) {
-			final InternalEObject oldProjectId = (InternalEObject) projectId;
+			InternalEObject oldProjectId = (InternalEObject) projectId;
 			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);
+				InternalEObject newProjectId = (InternalEObject) projectId;
+				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) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.PROJECT_SPACE__PROJECT_ID,
 						oldProjectId, projectId));
-				}
 			}
 		}
 		return projectId;
@@ -860,7 +842,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getProjectName() {
@@ -869,7 +851,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<EMFStoreProperty> getProperties() {
@@ -882,7 +864,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getResourceCount() {
@@ -891,18 +873,17 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Usersession getUsersession() {
 		if (usersession != null && usersession.eIsProxy()) {
-			final InternalEObject oldUsersession = (InternalEObject) usersession;
+			InternalEObject oldUsersession = (InternalEObject) usersession;
 			usersession = (Usersession) eResolveProxy(oldUsersession);
 			if (usersession != oldUsersession) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.PROJECT_SPACE__USERSESSION,
 						oldUsersession, usersession));
-				}
 			}
 		}
 		return usersession;
@@ -910,7 +891,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<FileIdentifier> getWaitingUploads() {
@@ -924,19 +905,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Workspace getWorkspace() {
-		if (eContainerFeatureID() != ModelPackage.PROJECT_SPACE__WORKSPACE) {
+		if (eContainerFeatureID() != ModelPackage.PROJECT_SPACE__WORKSPACE)
 			return null;
-		}
 		return (Workspace) eContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isDirty() {
@@ -945,220 +925,195 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setBaseVersion(PrimaryVersionSpec newBaseVersion) {
 		if (newBaseVersion != baseVersion) {
 			NotificationChain msgs = null;
-			if (baseVersion != null) {
-				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);
-			}
+			if (baseVersion != null)
+				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 = basicSetBaseVersion(newBaseVersion, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__BASE_VERSION,
 				newBaseVersion, newBaseVersion));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setDirty(boolean newDirty) {
-		final boolean oldDirty = dirty;
+		boolean oldDirty = dirty;
 		dirty = newDirty;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__DIRTY, oldDirty, dirty));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setLastUpdated(Date newLastUpdated) {
-		final Date oldLastUpdated = lastUpdated;
+		Date oldLastUpdated = lastUpdated;
 		lastUpdated = newLastUpdated;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__LAST_UPDATED,
 				oldLastUpdated, lastUpdated));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setProject(Project newProject) {
 		if (newProject != project) {
 			NotificationChain msgs = null;
-			if (project != null) {
-				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);
-			}
+			if (project != null)
+				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 = basicSetProject(newProject, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__PROJECT, newProject,
 				newProject));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setProjectDescription(String newProjectDescription) {
-		final String oldProjectDescription = projectDescription;
+		String oldProjectDescription = projectDescription;
 		projectDescription = newProjectDescription;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__PROJECT_DESCRIPTION,
 				oldProjectDescription, projectDescription));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setProjectId(ProjectId newProjectId) {
 		if (newProjectId != projectId) {
 			NotificationChain msgs = null;
-			if (projectId != null) {
-				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);
-			}
+			if (projectId != null)
+				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 = basicSetProjectId(newProjectId, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__PROJECT_ID, newProjectId,
 				newProjectId));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setProjectName(String newProjectName) {
-		final String oldProjectName = projectName;
+		String oldProjectName = projectName;
 		projectName = newProjectName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__PROJECT_NAME,
 				oldProjectName, projectName));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setResourceCount(int newResourceCount) {
-		final int oldResourceCount = resourceCount;
+		int oldResourceCount = resourceCount;
 		resourceCount = newResourceCount;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__RESOURCE_COUNT,
 				oldResourceCount, resourceCount));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setUsersession(Usersession newUsersession) {
-		final Usersession oldUsersession = usersession;
+		Usersession oldUsersession = usersession;
 		usersession = newUsersession;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__USERSESSION,
 				oldUsersession, usersession));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setWorkspace(Workspace newWorkspace) {
 		if (newWorkspace != eInternalContainer()
-			|| eContainerFeatureID() != ModelPackage.PROJECT_SPACE__WORKSPACE && newWorkspace != null) {
-			if (EcoreUtil.isAncestor(this, newWorkspace)) {
+			|| (eContainerFeatureID() != ModelPackage.PROJECT_SPACE__WORKSPACE && newWorkspace != null)) {
+			if (EcoreUtil.isAncestor(this, newWorkspace))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			}
 			NotificationChain msgs = null;
-			if (eInternalContainer() != null) {
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			}
-			if (newWorkspace != null) {
+			if (newWorkspace != null)
 				msgs = ((InternalEObject) newWorkspace).eInverseAdd(this, ModelPackage.WORKSPACE__PROJECT_SPACES,
 					Workspace.class, msgs);
-			}
 			msgs = basicSetWorkspace(newWorkspace, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__WORKSPACE, newWorkspace,
 				newWorkspace));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AbstractChangePackage getLocalChangePackage() {
 		if (localChangePackage != null && localChangePackage.eIsProxy()) {
-			final InternalEObject oldLocalChangePackage = (InternalEObject) localChangePackage;
+			InternalEObject oldLocalChangePackage = (InternalEObject) localChangePackage;
 			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);
+				InternalEObject newLocalChangePackage = (InternalEObject) localChangePackage;
+				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) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, oldLocalChangePackage, localChangePackage));
-				}
 			}
 		}
 		return localChangePackage;
@@ -1167,7 +1122,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AbstractChangePackage basicGetLocalChangePackage() {
@@ -1177,21 +1132,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetLocalChangePackage(AbstractChangePackage newLocalChangePackage,
 		NotificationChain msgs) {
-		final AbstractChangePackage oldLocalChangePackage = localChangePackage;
+		AbstractChangePackage oldLocalChangePackage = localChangePackage;
 		localChangePackage = newLocalChangePackage;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, oldLocalChangePackage, newLocalChangePackage);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -1199,55 +1153,49 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setLocalChangePackage(AbstractChangePackage newLocalChangePackage) {
 		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);
-			}
-			if (newLocalChangePackage != null) {
-				msgs = ((InternalEObject) newLocalChangePackage).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE, null, msgs);
-			}
+			if (localChangePackage != null)
+				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 = basicSetLocalChangePackage(newLocalChangePackage, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__LOCAL_CHANGE_PACKAGE,
 				newLocalChangePackage, newLocalChangePackage));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PrimaryVersionSpec getMergedVersion() {
 		if (mergedVersion != null && mergedVersion.eIsProxy()) {
-			final InternalEObject oldMergedVersion = (InternalEObject) mergedVersion;
+			InternalEObject oldMergedVersion = (InternalEObject) mergedVersion;
 			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);
+				InternalEObject newMergedVersion = (InternalEObject) mergedVersion;
+				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) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						ModelPackage.PROJECT_SPACE__MERGED_VERSION, oldMergedVersion, mergedVersion));
-				}
 			}
 		}
 		return mergedVersion;
@@ -1256,7 +1204,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PrimaryVersionSpec basicGetMergedVersion() {
@@ -1266,20 +1214,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetMergedVersion(PrimaryVersionSpec newMergedVersion, NotificationChain msgs) {
-		final PrimaryVersionSpec oldMergedVersion = mergedVersion;
+		PrimaryVersionSpec oldMergedVersion = mergedVersion;
 		mergedVersion = newMergedVersion;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.PROJECT_SPACE__MERGED_VERSION, oldMergedVersion, newMergedVersion);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -1287,43 +1234,38 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setMergedVersion(PrimaryVersionSpec newMergedVersion) {
 		if (newMergedVersion != mergedVersion) {
 			NotificationChain msgs = null;
-			if (mergedVersion != null) {
-				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);
-			}
+			if (mergedVersion != null)
+				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 = basicSetMergedVersion(newMergedVersion, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROJECT_SPACE__MERGED_VERSION,
 				newMergedVersion, newMergedVersion));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (projectName: "); //$NON-NLS-1$
 		result.append(projectName);
 		result.append(", projectDescription: "); //$NON-NLS-1$
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..62fe2ac 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
  */
@@ -88,7 +88,7 @@
 	/**
 	 * The cached value of the '{@link #getUrl() <em>Url</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getUrl()
 	 * @generated
 	 * @ordered
@@ -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
@@ -147,7 +149,7 @@
 	 * The cached value of the '{@link #getLastUsersession() <em>Last Usersession</em>}' reference.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLastUsersession()
 	 * @generated
 	 * @ordered
@@ -176,7 +178,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ServerInfoImpl() {
@@ -185,7 +187,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -195,7 +197,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -204,20 +206,19 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
-		final String oldName = name;
+		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVER_INFO__NAME, oldName, name));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getUrl() {
@@ -226,20 +227,19 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setUrl(String newUrl) {
-		final String oldUrl = url;
+		String oldUrl = url;
 		url = newUrl;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVER_INFO__URL, oldUrl, url));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getPort() {
@@ -248,34 +248,33 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setPort(int newPort) {
-		final int oldPort = port;
+		int oldPort = port;
 		port = newPort;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVER_INFO__PORT, oldPort, port));
-		}
 	}
 
 	/**
 	 * <!-- 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)
-	{
+	public void setPath(String newPath) {
 		String oldPath = path;
 		path = newPath;
 		if (eNotificationRequired())
@@ -284,12 +283,11 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<ProjectInfo> getProjectInfos() {
-		if (projectInfos == null)
-		{
+		if (projectInfos == null) {
 			projectInfos = new EObjectContainmentEList.Resolving<ProjectInfo>(ProjectInfo.class, this,
 				ModelPackage.SERVER_INFO__PROJECT_INFOS);
 		}
@@ -298,20 +296,17 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Usersession getLastUsersession() {
-		if (lastUsersession != null && lastUsersession.eIsProxy())
-		{
-			final InternalEObject oldLastUsersession = (InternalEObject) lastUsersession;
+		if (lastUsersession != null && lastUsersession.eIsProxy()) {
+			InternalEObject oldLastUsersession = (InternalEObject) lastUsersession;
 			lastUsersession = (Usersession) eResolveProxy(oldLastUsersession);
-			if (lastUsersession != oldLastUsersession)
-			{
-				if (eNotificationRequired()) {
+			if (lastUsersession != oldLastUsersession) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						ModelPackage.SERVER_INFO__LAST_USERSESSION, oldLastUsersession, lastUsersession));
-				}
 			}
 		}
 		return lastUsersession;
@@ -319,7 +314,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Usersession basicGetLastUsersession() {
@@ -328,21 +323,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setLastUsersession(Usersession newLastUsersession) {
-		final Usersession oldLastUsersession = lastUsersession;
+		Usersession oldLastUsersession = lastUsersession;
 		lastUsersession = newLastUsersession;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVER_INFO__LAST_USERSESSION,
 				oldLastUsersession, lastUsersession));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getCertificateAlias() {
@@ -351,27 +345,25 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setCertificateAlias(String newCertificateAlias) {
-		final String oldCertificateAlias = certificateAlias;
+		String oldCertificateAlias = certificateAlias;
 		certificateAlias = newCertificateAlias;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.SERVER_INFO__CERTIFICATE_ALIAS,
 				oldCertificateAlias, certificateAlias));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
 		}
@@ -380,13 +372,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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:
@@ -398,9 +389,8 @@
 		case ModelPackage.SERVER_INFO__PROJECT_INFOS:
 			return getProjectInfos();
 		case ModelPackage.SERVER_INFO__LAST_USERSESSION:
-			if (resolve) {
+			if (resolve)
 				return getLastUsersession();
-			}
 			return basicGetLastUsersession();
 		case ModelPackage.SERVER_INFO__CERTIFICATE_ALIAS:
 			return getCertificateAlias();
@@ -410,14 +400,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.SERVER_INFO__NAME:
 			setName((String) newValue);
 			return;
@@ -446,13 +435,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.SERVER_INFO__NAME:
 			setName(NAME_EDEFAULT);
 			return;
@@ -480,13 +468,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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,24 +487,23 @@
 		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);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(", url: "); //$NON-NLS-1$
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..f83bbe0 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
  */
@@ -72,7 +73,7 @@
 	/**
 	 * The default value of the '{@link #getUsername() <em>Username</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getUsername()
 	 * @generated
 	 * @ordered
@@ -82,7 +83,7 @@
 	/**
 	 * The cached value of the '{@link #getUsername() <em>Username</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getUsername()
 	 * @generated
 	 * @ordered
@@ -92,7 +93,7 @@
 	/**
 	 * The default value of the '{@link #getPassword() <em>Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPassword()
 	 * @generated
 	 * @ordered
@@ -102,7 +103,7 @@
 	/**
 	 * The cached value of the '{@link #getPassword() <em>Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPassword()
 	 * @generated
 	 * @ordered
@@ -112,7 +113,7 @@
 	/**
 	 * The cached value of the '{@link #getSessionId() <em>Session Id</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getSessionId()
 	 * @generated
 	 * @ordered
@@ -123,7 +124,7 @@
 	 * The default value of the '{@link #getPersistentPassword() <em>Persistent Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getPersistentPassword()
 	 * @generated
 	 * @ordered
@@ -134,7 +135,7 @@
 	 * The cached value of the '{@link #getPersistentPassword() <em>Persistent Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getPersistentPassword()
 	 * @generated
 	 * @ordered
@@ -144,7 +145,7 @@
 	/**
 	 * The cached value of the '{@link #getServerInfo() <em>Server Info</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getServerInfo()
 	 * @generated
 	 * @ordered
@@ -155,7 +156,7 @@
 	 * The default value of the '{@link #isSavePassword() <em>Save Password</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #isSavePassword()
 	 * @generated
 	 * @ordered
@@ -166,7 +167,7 @@
 	 * The cached value of the '{@link #isSavePassword() <em>Save Password</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSavePassword()
 	 * @generated
 	 * @ordered
@@ -176,7 +177,7 @@
 	/**
 	 * The cached value of the '{@link #getACUser() <em>AC User</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getACUser()
 	 * @generated
 	 * @ordered
@@ -196,7 +197,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected UsersessionImpl() {
@@ -205,7 +206,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -215,7 +216,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getUsername() {
@@ -224,21 +225,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setUsername(String newUsername) {
-		final String oldUsername = username;
+		String oldUsername = username;
 		username = newUsername;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__USERNAME, oldUsername,
 				username));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getPasswordGen() {
@@ -264,16 +264,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setPasswordGen(String newPassword) {
-		final String oldPassword = password;
+		String oldPassword = password;
 		password = newPassword;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__PASSWORD, oldPassword,
 				password));
-		}
 	}
 
 	// begin of custom code
@@ -300,20 +299,17 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public SessionId getSessionIdGen() {
-		if (sessionId != null && sessionId.eIsProxy())
-		{
-			final InternalEObject oldSessionId = (InternalEObject) sessionId;
+		if (sessionId != null && sessionId.eIsProxy()) {
+			InternalEObject oldSessionId = (InternalEObject) sessionId;
 			sessionId = (SessionId) eResolveProxy(oldSessionId);
-			if (sessionId != oldSessionId)
-			{
-				if (eNotificationRequired()) {
+			if (sessionId != oldSessionId) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.USERSESSION__SESSION_ID,
 						oldSessionId, sessionId));
-				}
 			}
 		}
 		return sessionId;
@@ -321,7 +317,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public SessionId basicGetSessionId() {
@@ -330,21 +326,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSessionId(SessionId newSessionId) {
-		final SessionId oldSessionId = sessionId;
+		SessionId oldSessionId = sessionId;
 		sessionId = newSessionId;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__SESSION_ID, oldSessionId,
 				sessionId));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getPersistentPassword() {
@@ -353,16 +348,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setPersistentPasswordGen(String newPersistentPassword) {
-		final String oldPersistentPassword = persistentPassword;
+		String oldPersistentPassword = persistentPassword;
 		persistentPassword = newPersistentPassword;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__PERSISTENT_PASSWORD,
 				oldPersistentPassword, persistentPassword));
-		}
 	}
 
 	/**
@@ -379,20 +373,17 @@
 	// end of custom code
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ServerInfo getServerInfo() {
-		if (serverInfo != null && serverInfo.eIsProxy())
-		{
-			final InternalEObject oldServerInfo = (InternalEObject) serverInfo;
+		if (serverInfo != null && serverInfo.eIsProxy()) {
+			InternalEObject oldServerInfo = (InternalEObject) serverInfo;
 			serverInfo = (ServerInfo) eResolveProxy(oldServerInfo);
-			if (serverInfo != oldServerInfo)
-			{
-				if (eNotificationRequired()) {
+			if (serverInfo != oldServerInfo) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.USERSESSION__SERVER_INFO,
 						oldServerInfo, serverInfo));
-				}
 			}
 		}
 		return serverInfo;
@@ -400,7 +391,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ServerInfo basicGetServerInfo() {
@@ -409,21 +400,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setServerInfo(ServerInfo newServerInfo) {
-		final ServerInfo oldServerInfo = serverInfo;
+		ServerInfo oldServerInfo = serverInfo;
 		serverInfo = newServerInfo;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__SERVER_INFO, oldServerInfo,
 				serverInfo));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSavePassword() {
@@ -432,16 +422,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSavePasswordGen(boolean newSavePassword) {
-		final boolean oldSavePassword = savePassword;
+		boolean oldSavePassword = savePassword;
 		savePassword = newSavePassword;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.USERSESSION__SAVE_PASSWORD,
 				oldSavePassword, savePassword));
-		}
 	}
 
 	// begin of custom code
@@ -466,31 +455,26 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ACUser getACUser() {
-		if (acUser != null && acUser.eIsProxy())
-		{
-			final InternalEObject oldACUser = (InternalEObject) acUser;
+		if (acUser != null && acUser.eIsProxy()) {
+			InternalEObject oldACUser = (InternalEObject) acUser;
 			acUser = (ACUser) eResolveProxy(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);
+			if (acUser != oldACUser) {
+				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);
 				}
-				if (msgs != null) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.USERSESSION__AC_USER,
 						oldACUser, acUser));
-				}
 			}
 		}
 		return acUser;
@@ -498,7 +482,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ACUser basicGetACUser() {
@@ -507,61 +491,52 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetACUser(ACUser newACUser, NotificationChain msgs) {
-		final ACUser oldACUser = acUser;
+		ACUser oldACUser = acUser;
 		acUser = newACUser;
-		if (eNotificationRequired())
-		{
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.USERSESSION__AC_USER, oldACUser, newACUser);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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);
-			}
-			if (newACUser != null) {
-				msgs = ((InternalEObject) newACUser).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ModelPackage.USERSESSION__AC_USER, null, msgs);
-			}
+			if (acUser != null)
+				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 = basicSetACUser(newACUser, msgs);
-			if (msgs != null) {
+			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));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<OrgUnitProperty> getChangedProperties() {
-		if (changedProperties == null)
-		{
+		if (changedProperties == null) {
 			changedProperties = new EObjectContainmentEList.Resolving<OrgUnitProperty>(OrgUnitProperty.class, this,
 				ModelPackage.USERSESSION__CHANGED_PROPERTIES);
 		}
@@ -624,13 +599,12 @@
 	// end of custom code
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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:
@@ -642,35 +616,31 @@
 	// end of custom code
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.USERSESSION__USERNAME:
 			return getUsername();
 		case ModelPackage.USERSESSION__PASSWORD:
 			return getPassword();
 		case ModelPackage.USERSESSION__SESSION_ID:
-			if (resolve) {
+			if (resolve)
 				return getSessionId();
-			}
 			return basicGetSessionId();
 		case ModelPackage.USERSESSION__PERSISTENT_PASSWORD:
 			return getPersistentPassword();
 		case ModelPackage.USERSESSION__SERVER_INFO:
-			if (resolve) {
+			if (resolve)
 				return getServerInfo();
-			}
 			return basicGetServerInfo();
 		case ModelPackage.USERSESSION__SAVE_PASSWORD:
 			return isSavePassword();
 		case ModelPackage.USERSESSION__AC_USER:
-			if (resolve) {
+			if (resolve)
 				return getACUser();
-			}
 			return basicGetACUser();
 		case ModelPackage.USERSESSION__CHANGED_PROPERTIES:
 			return getChangedProperties();
@@ -680,14 +650,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.USERSESSION__USERNAME:
 			setUsername((String) newValue);
 			return;
@@ -719,13 +688,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.USERSESSION__USERNAME:
 			setUsername(USERNAME_EDEFAULT);
 			return;
@@ -756,13 +724,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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 +737,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..c7b947b 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>
  *
@@ -44,7 +46,7 @@
 	 * The cached value of the '{@link #getProjectSpaces() <em>Project Spaces</em>}' containment reference list.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getProjectSpaces()
 	 * @generated
 	 * @ordered
@@ -54,7 +56,7 @@
 	/**
 	 * The cached value of the '{@link #getServerInfos() <em>Server Infos</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getServerInfos()
 	 * @generated
 	 * @ordered
@@ -74,7 +76,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected WorkspaceImpl() {
@@ -83,13 +85,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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:
@@ -103,14 +104,13 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
 		}
@@ -119,13 +119,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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:
@@ -138,13 +137,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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:
@@ -157,14 +155,13 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
@@ -183,7 +180,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -193,13 +190,12 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID)
-		{
+		switch (featureID) {
 		case ModelPackage.WORKSPACE__PROJECT_SPACES:
 			getProjectSpaces().clear();
 			return;
@@ -215,12 +211,11 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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);
 		}
@@ -229,12 +224,11 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<ServerInfo> getServerInfos() {
-		if (serverInfos == null)
-		{
+		if (serverInfos == null) {
 			serverInfos = new EObjectContainmentEList.Resolving<ServerInfo>(ServerInfo.class, this,
 				ModelPackage.WORKSPACE__SERVER_INFOS);
 		}
@@ -243,12 +237,11 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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/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..7021f33 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
@@ -77,7 +77,8 @@
 			final ESLocalProject serverESProject = localProject
 				.getRemoteProject()
 				.checkout(
-					"log_error_checksum_debug_checkout", localProject.getUsersession(), versionSpec, new NullProgressMonitor()); //$NON-NLS-1$
+					"log_error_checksum_debug_checkout", localProject.getUsersession(), versionSpec, //$NON-NLS-1$
+					new NullProgressMonitor());
 			final Project serverProject = ESLocalProjectImpl.class.cast(serverESProject).toInternalAPI()
 				.getProject();
 			try {
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..b5a1f93 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
@@ -26,7 +26,7 @@
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage
  * @generated
  */
@@ -34,7 +34,7 @@
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static ModelPackage modelPackage;
@@ -43,12 +43,11 @@
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelAdapterFactory() {
-		if (modelPackage == null)
-		{
+		if (modelPackage == null) {
 			modelPackage = ModelPackage.eINSTANCE;
 		}
 	}
@@ -58,18 +57,16 @@
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage)
-		{
+		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();
 		}
 	};
@@ -130,7 +119,7 @@
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
@@ -162,7 +151,7 @@
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ServerInfo
 	 * @generated
@@ -178,7 +167,7 @@
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.Usersession
 	 * @generated
@@ -194,7 +183,7 @@
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.ProjectSpace
 	 * @generated
@@ -210,7 +199,7 @@
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.client.model.PendingFileTransfer
 	 * @generated
@@ -226,7 +215,7 @@
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement
 	 * @generated
@@ -239,7 +228,7 @@
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
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..4ab6e75 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
@@ -32,7 +32,7 @@
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.client.model.ModelPackage
  * @generated
  */
@@ -41,7 +41,7 @@
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static ModelPackage modelPackage;
@@ -50,12 +50,11 @@
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelSwitch() {
-		if (modelPackage == null)
-		{
+		if (modelPackage == null) {
 			modelPackage = ModelPackage.eINSTANCE;
 		}
 	}
@@ -65,7 +64,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -78,19 +77,16 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage)
-		{
+		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);
+		List<EClass> eSuperTypes = theEClass.getESuperTypes();
+		return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
 	}
 
 	/**
@@ -98,54 +94,47 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID)
-		{
+		switch (classifierID) {
 		case ModelPackage.WORKSPACE: {
-			final Workspace workspace = (Workspace) theEObject;
+			Workspace workspace = (Workspace) theEObject;
 			T result = caseWorkspace(workspace);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.SERVER_INFO: {
-			final ServerInfo serverInfo = (ServerInfo) theEObject;
+			ServerInfo serverInfo = (ServerInfo) theEObject;
 			T result = caseServerInfo(serverInfo);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.USERSESSION: {
-			final Usersession usersession = (Usersession) theEObject;
+			Usersession usersession = (Usersession) theEObject;
 			T result = caseUsersession(usersession);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.PROJECT_SPACE: {
-			final ProjectSpace projectSpace = (ProjectSpace) theEObject;
+			ProjectSpace projectSpace = (ProjectSpace) theEObject;
 			T result = caseProjectSpace(projectSpace);
-			if (result == null) {
+			if (result == null)
 				result = caseIdentifiableElement(projectSpace);
-			}
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.PENDING_FILE_TRANSFER: {
-			final PendingFileTransfer pendingFileTransfer = (PendingFileTransfer) theEObject;
+			PendingFileTransfer pendingFileTransfer = (PendingFileTransfer) theEObject;
 			T result = casePendingFileTransfer(pendingFileTransfer);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		default:
@@ -159,7 +148,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Workspace</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -175,7 +164,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Server Info</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -191,7 +180,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Usersession</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -207,7 +196,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Project Space</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -223,7 +212,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Pending File Transfer</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -239,7 +228,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Identifiable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -255,7 +244,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
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/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..9410f5d 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
@@ -17,16 +17,15 @@
  * This is the central singleton for the Common edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public final class CommonEditPlugin extends EMFPlugin
-{
+public final class CommonEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final CommonEditPlugin INSTANCE = new CommonEditPlugin();
@@ -35,7 +34,7 @@
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -44,27 +43,24 @@
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public CommonEditPlugin()
-	{
-		super(new ResourceLocator[]
-		{
-			});
+	public CommonEditPlugin() {
+		super(new ResourceLocator[] {
+		});
 	}
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getPluginResourceLocator()
-	{
+	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
 
@@ -72,12 +68,11 @@
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	public static Implementation getPlugin()
-	{
+	public static Implementation getPlugin() {
 		return plugin;
 	}
 
@@ -85,20 +80,18 @@
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class Implementation extends EclipsePlugin
-	{
+	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @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..a85a5ed 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
@@ -32,7 +32,7 @@
  * object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class EMFStorePropertyItemProvider extends RootElementItemProvider implements IEditingDomainItemProvider,
@@ -41,7 +41,7 @@
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStorePropertyItemProvider(AdapterFactory adapterFactory) {
@@ -52,13 +52,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addKeyPropertyDescriptor(object);
@@ -73,13 +72,12 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -97,13 +95,12 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -121,13 +118,12 @@
 	 * This adds a property descriptor for the Type feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -145,13 +141,12 @@
 	 * This adds a property descriptor for the Version feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -169,7 +164,7 @@
 	 * This returns EMFStoreProperty.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -181,14 +176,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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$
+		String label = ((EMFStoreProperty) object).getKey();
+		return label == null || label.length() == 0 ? getString("_UI_EMFStoreProperty_type") : //$NON-NLS-1$
 			getString("_UI_EMFStoreProperty_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -197,15 +191,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	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:
@@ -220,7 +213,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,7 +225,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..a9199b5 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
@@ -32,7 +32,7 @@
  * object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class IdentifiableElementItemProvider extends RootElementItemProvider implements IEditingDomainItemProvider,
@@ -40,7 +40,7 @@
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public IdentifiableElementItemProvider(AdapterFactory adapterFactory) {
@@ -50,13 +50,12 @@
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addIdentifierPropertyDescriptor(object);
@@ -67,13 +66,12 @@
 	/**
 	 * This adds a property descriptor for the Identifier feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -90,14 +88,13 @@
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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$
+		String label = ((IdentifiableElement) object).getIdentifier();
+		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;
@@ -125,7 +121,7 @@
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
 	 * that can be created under this object.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,7 +132,7 @@
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..72954df 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
@@ -22,14 +22,14 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.ModelElementId} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelElementIdItemProvider extends UniqueIdentifierItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelElementIdItemProvider(AdapterFactory adapterFactory) {
@@ -39,13 +39,12 @@
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -55,7 +54,7 @@
 	/**
 	 * This returns ModelElementId.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,14 +65,13 @@
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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$
+		String label = ((ModelElementId) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_ModelElementId_type") : //$NON-NLS-1$
 			getString("_UI_ModelElementId_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -94,7 +92,7 @@
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
 	 * that can be created under this object.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..3902cbe 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
@@ -37,7 +37,7 @@
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelItemProviderAdapterFactory extends ModelAdapterFactory implements ComposeableAdapterFactory,
@@ -46,7 +46,7 @@
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -73,7 +73,7 @@
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelItemProviderAdapterFactory() {
@@ -89,7 +89,7 @@
 	 * instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ProjectItemProvider projectItemProvider;
@@ -98,13 +98,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.Project}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createProjectAdapter() {
-		if (projectItemProvider == null)
-		{
+		if (projectItemProvider == null) {
 			projectItemProvider = new ProjectItemProvider(this);
 		}
 
@@ -116,7 +115,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.ModelElementId} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ModelElementIdItemProvider modelElementIdItemProvider;
@@ -125,13 +124,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.ModelElementId}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createModelElementIdAdapter() {
-		if (modelElementIdItemProvider == null)
-		{
+		if (modelElementIdItemProvider == null) {
 			modelElementIdItemProvider = new ModelElementIdItemProvider(this);
 		}
 
@@ -143,7 +141,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.ModelVersion} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ModelVersionItemProvider modelVersionItemProvider;
@@ -152,13 +150,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.ModelVersion}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createModelVersionAdapter() {
-		if (modelVersionItemProvider == null)
-		{
+		if (modelVersionItemProvider == null) {
 			modelVersionItemProvider = new ModelVersionItemProvider(this);
 		}
 
@@ -170,7 +167,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EMFStorePropertyItemProvider emfStorePropertyItemProvider;
@@ -179,13 +176,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createEMFStorePropertyAdapter() {
-		if (emfStorePropertyItemProvider == null)
-		{
+		if (emfStorePropertyItemProvider == null) {
 			emfStorePropertyItemProvider = new EMFStorePropertyItemProvider(this);
 		}
 
@@ -196,7 +192,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PropertyMapEntryItemProvider propertyMapEntryItemProvider;
@@ -205,13 +201,12 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPropertyMapEntryAdapter() {
-		if (propertyMapEntryItemProvider == null)
-		{
+		if (propertyMapEntryItemProvider == null) {
 			propertyMapEntryItemProvider = new PropertyMapEntryItemProvider(this);
 		}
 
@@ -223,7 +218,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PropertyStringValueItemProvider propertyStringValueItemProvider;
@@ -232,13 +227,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPropertyStringValueAdapter() {
-		if (propertyStringValueItemProvider == null)
-		{
+		if (propertyStringValueItemProvider == null) {
 			propertyStringValueItemProvider = new PropertyStringValueItemProvider(this);
 		}
 
@@ -249,7 +243,7 @@
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -260,7 +254,7 @@
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -270,7 +264,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -282,7 +276,7 @@
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -293,16 +287,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -314,7 +306,7 @@
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -325,7 +317,7 @@
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -336,14 +328,13 @@
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -352,28 +343,22 @@
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (projectItemProvider != null) {
+		if (projectItemProvider != null)
 			projectItemProvider.dispose();
-		}
-		if (modelElementIdItemProvider != null) {
+		if (modelElementIdItemProvider != null)
 			modelElementIdItemProvider.dispose();
-		}
-		if (modelVersionItemProvider != null) {
+		if (modelVersionItemProvider != null)
 			modelVersionItemProvider.dispose();
-		}
-		if (emfStorePropertyItemProvider != null) {
+		if (emfStorePropertyItemProvider != null)
 			emfStorePropertyItemProvider.dispose();
-		}
-		if (propertyMapEntryItemProvider != null) {
+		if (propertyMapEntryItemProvider != null)
 			propertyMapEntryItemProvider.dispose();
-		}
-		if (propertyStringValueItemProvider != null) {
+		if (propertyStringValueItemProvider != null)
 			propertyStringValueItemProvider.dispose();
-		}
 	}
 
 }
\ No newline at end of file
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..a4827a2 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
@@ -31,7 +31,7 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.common.model.ModelVersion} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelVersionItemProvider extends RootElementItemProvider implements IEditingDomainItemProvider,
@@ -39,7 +39,7 @@
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelVersionItemProvider(AdapterFactory adapterFactory) {
@@ -49,13 +49,12 @@
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addReleaseNumberPropertyDescriptor(object);
@@ -66,13 +65,12 @@
 	/**
 	 * This adds a property descriptor for the Release Number feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -89,7 +87,7 @@
 	/**
 	 * This returns ModelVersion.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,12 +98,12 @@
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final ModelVersion modelVersion = (ModelVersion) object;
+		ModelVersion modelVersion = (ModelVersion) object;
 		return getString("_UI_ModelVersion_type") + " " + modelVersion.getReleaseNumber(); //$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;
@@ -133,7 +130,7 @@
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
 	 * that can be created under this object.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -144,7 +141,7 @@
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..a0f0706 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);
 
 		}
@@ -69,13 +68,12 @@
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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);
@@ -85,7 +83,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,15 +99,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	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()));
 	}
 
 	/**
@@ -198,15 +171,13 @@
 	 */
 	@Override
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		final Object childFeature = feature;
-		final Object childObject = child;
+		Object childFeature = feature;
+		Object childObject = child;
 
-		final boolean qualify =
-			childFeature == ModelPackage.Literals.PROJECT__MODEL_ELEMENTS ||
-				childFeature == ModelPackage.Literals.PROJECT__CUT_ELEMENTS;
+		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..b4c8d98 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
@@ -31,7 +31,7 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class PropertyMapEntryItemProvider extends RootElementItemProvider implements IEditingDomainItemProvider,
@@ -40,7 +40,7 @@
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PropertyMapEntryItemProvider(AdapterFactory adapterFactory) {
@@ -51,13 +51,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addKeyPropertyDescriptor(object);
@@ -70,13 +69,12 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -94,13 +92,12 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -118,7 +115,7 @@
 	 * This returns PropertyMapEntry.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,12 +127,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final Map.Entry<?, ?> propertyMapEntry = (Map.Entry<?, ?>) object;
+		Map.Entry<?, ?> propertyMapEntry = (Map.Entry<?, ?>) object;
 		return "" + propertyMapEntry.getKey() + " -> " + propertyMapEntry.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -144,15 +141,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	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;
@@ -165,7 +161,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,7 +173,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..a468890 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;
@@ -32,16 +28,15 @@
  * object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @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 -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PropertyStringValueItemProvider(AdapterFactory adapterFactory) {
@@ -52,13 +47,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addValuePropertyDescriptor(object);
@@ -70,13 +64,12 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -94,7 +87,7 @@
 	 * This returns PropertyStringValue.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,14 +99,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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$
+		String label = ((PropertyStringValue) object).getValue();
+		return label == null || label.length() == 0 ? getString("_UI_PropertyStringValue_type") : //$NON-NLS-1$
 			getString("_UI_PropertyStringValue_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -122,15 +114,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	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;
@@ -143,7 +134,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -155,7 +146,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..3358994 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
@@ -32,7 +32,7 @@
  * object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class UniqueIdentifierItemProvider extends RootElementItemProvider implements IEditingDomainItemProvider,
@@ -40,7 +40,7 @@
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public UniqueIdentifierItemProvider(AdapterFactory adapterFactory) {
@@ -50,13 +50,12 @@
 	/**
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null)
-		{
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addIdPropertyDescriptor(object);
@@ -67,13 +66,12 @@
 	/**
 	 * This adds a property descriptor for the Id feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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$
@@ -90,14 +88,13 @@
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@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$
+		String label = ((UniqueIdentifier) object).getId();
+		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;
@@ -125,7 +121,7 @@
 	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
 	 * that can be created under this object.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,7 +132,7 @@
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..14c589a 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
@@ -43,7 +43,7 @@
 	 * If the meaning of the '<em>Key</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Key</em>' attribute.
 	 * @see #setKey(String)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getEMFStoreProperty_Key()
@@ -53,12 +53,11 @@
 	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 -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Key</em>' attribute.
 	 * @see #getKey()
 	 * @generated
@@ -73,7 +72,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Value</em>' containment reference.
 	 * @see #setValue(EObject)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getEMFStoreProperty_Value()
@@ -84,11 +83,10 @@
 
 	/**
 	 * 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 -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Value</em>' containment reference.
 	 * @see #getValue()
 	 * @generated
@@ -104,7 +102,7 @@
 	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStorePropertyType
 	 * @see #setType(EMFStorePropertyType)
@@ -116,11 +114,10 @@
 
 	/**
 	 * 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 -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStorePropertyType
 	 * @see #getType()
@@ -136,7 +133,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Version</em>' attribute.
 	 * @see #setVersion(int)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getEMFStoreProperty_Version()
@@ -147,10 +144,10 @@
 
 	/**
 	 * 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 -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Version</em>' attribute.
 	 * @see #getVersion()
 	 * @generated
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..5b6d930 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
@@ -21,7 +21,7 @@
  * A representation of the literals of the enumeration '<em><b>EMF Store Property Type</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getEMFStorePropertyType()
  * @model
  * @generated
@@ -31,7 +31,7 @@
 	 * The '<em><b>Shared</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #SHARED_VALUE
 	 * @generated
 	 * @ordered
@@ -42,7 +42,7 @@
 	 * The '<em><b>Local</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #LOCAL_VALUE
 	 * @generated
 	 * @ordered
@@ -57,7 +57,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #SHARED
 	 * @model name="Shared"
 	 * @generated
@@ -73,7 +73,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #LOCAL
 	 * @model name="Local"
 	 * @generated
@@ -85,16 +85,19 @@
 	 * An array of all the '<em><b>EMF Store Property Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @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.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<EMFStorePropertyType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -103,12 +106,14 @@
 	 * Returns the '<em><b>EMF Store Property Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static EMFStorePropertyType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final EMFStorePropertyType result = VALUES_ARRAY[i];
+			EMFStorePropertyType result = VALUES_ARRAY[i];
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -120,12 +125,14 @@
 	 * Returns the '<em><b>EMF Store Property Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static EMFStorePropertyType getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final EMFStorePropertyType result = VALUES_ARRAY[i];
+			EMFStorePropertyType result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -137,7 +144,9 @@
 	 * Returns the '<em><b>EMF Store Property Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static EMFStorePropertyType get(int value) {
@@ -153,7 +162,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -161,7 +170,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -169,7 +178,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -178,7 +187,7 @@
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EMFStorePropertyType(int value, String name, String literal) {
@@ -190,7 +199,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
@@ -200,7 +209,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -210,7 +219,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
@@ -221,7 +230,7 @@
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..82c506a 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"
@@ -36,7 +36,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Identifier</em>' attribute.
 	 * @see #setIdentifier(String)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getIdentifiableElement_Identifier()
@@ -49,7 +49,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement#getIdentifier
 	 * <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Identifier</em>' attribute.
 	 * @see #getIdentifier()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelFactory.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelFactory.java
index e43561b..44ad22c 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/ModelFactory.java
@@ -17,7 +17,7 @@
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage
  * @generated
  */
@@ -26,7 +26,7 @@
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	ModelFactory eINSTANCE = org.eclipse.emf.emfstore.internal.common.model.impl.ModelFactoryImpl.init();
@@ -35,7 +35,7 @@
 	 * Returns a new object of class '<em>Project</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Project</em>'.
 	 * @generated
 	 */
@@ -45,7 +45,7 @@
 	 * Returns a new object of class '<em>Element Id</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Element Id</em>'.
 	 * @generated
 	 */
@@ -55,7 +55,7 @@
 	 * Returns a new object of class '<em>Version</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Version</em>'.
 	 * @generated
 	 */
@@ -65,7 +65,7 @@
 	 * Returns a new object of class '<em>EMF Store Property</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>EMF Store Property</em>'.
 	 * @generated
 	 */
@@ -75,7 +75,7 @@
 	 * Returns a new object of class '<em>Property String Value</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Property String Value</em>'.
 	 * @generated
 	 */
@@ -85,7 +85,7 @@
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
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..8aaaaef 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
@@ -28,7 +28,7 @@
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.common.model.ModelFactory
  * @model kind="package"
  * @generated
@@ -38,7 +38,7 @@
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNAME = "model"; //$NON-NLS-1$
@@ -47,7 +47,7 @@
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://eclipse.org/emf/emfstore/common/model"; //$NON-NLS-1$
@@ -56,27 +56,26 @@
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	String eNS_PREFIX = "org.eclipse.emf.emfstore.internal.common.model"; //$NON-NLS-1$
+	String eNS_PREFIX = "org.eclipse.emf.emfstore.common.model"; //$NON-NLS-1$
 
 	/**
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	ModelPackage eINSTANCE = org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl.init();
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.common.model.impl.ProjectImpl
-	 * <em>Project</em>}'
-	 * class.
+	 * <em>Project</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ProjectImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getProject()
 	 * @generated
@@ -87,7 +86,7 @@
 	 * The feature id for the '<em><b>Model Elements</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -97,7 +96,7 @@
 	 * The feature id for the '<em><b>Cut Elements</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -107,7 +106,7 @@
 	 * The number of structural features of the '<em>Project</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -118,7 +117,7 @@
 	 * <em>Unique Identifier</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.UniqueIdentifierImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getUniqueIdentifier()
 	 * @generated
@@ -129,7 +128,7 @@
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -139,7 +138,7 @@
 	 * The number of structural features of the '<em>Unique Identifier</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -150,7 +149,7 @@
 	 * <em>Identifiable Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.IdentifiableElementImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getIdentifiableElement()
 	 * @generated
@@ -161,7 +160,7 @@
 	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -171,7 +170,7 @@
 	 * The number of structural features of the '<em>Identifiable Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -182,7 +181,7 @@
 	 * <em>Element Id</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelElementIdImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getModelElementId()
 	 * @generated
@@ -193,7 +192,7 @@
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -203,7 +202,7 @@
 	 * The number of structural features of the '<em>Element Id</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -211,11 +210,10 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.common.model.impl.ModelVersionImpl
-	 * <em>Version</em>}'
-	 * class.
+	 * <em>Version</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelVersionImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getModelVersion()
 	 * @generated
@@ -226,7 +224,7 @@
 	 * The feature id for the '<em><b>Release Number</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -236,7 +234,7 @@
 	 * The number of structural features of the '<em>Version</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -247,7 +245,7 @@
 	 * <em>Non Domain Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.NonDomainElement
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getNonDomainElement()
 	 * @generated
@@ -258,7 +256,7 @@
 	 * The number of structural features of the '<em>Non Domain Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -269,7 +267,7 @@
 	 * <em>Association Class Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.AssociationClassElement
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getAssociationClassElement()
 	 * @generated
@@ -280,7 +278,7 @@
 	 * The number of structural features of the '<em>Association Class Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -291,7 +289,7 @@
 	 * <em>EMF Store Property</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getEMFStoreProperty()
 	 * @generated
@@ -302,7 +300,7 @@
 	 * The feature id for the '<em><b>Key</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -312,7 +310,7 @@
 	 * The feature id for the '<em><b>Value</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -322,7 +320,7 @@
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -332,7 +330,7 @@
 	 * The feature id for the '<em><b>Version</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -342,7 +340,7 @@
 	 * The number of structural features of the '<em>EMF Store Property</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -353,7 +351,7 @@
 	 * <em>Property Map Entry</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getPropertyMapEntry()
 	 * @generated
@@ -364,7 +362,7 @@
 	 * The feature id for the '<em><b>Key</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -374,7 +372,7 @@
 	 * The feature id for the '<em><b>Value</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -384,7 +382,7 @@
 	 * The number of structural features of the '<em>Property Map Entry</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -395,7 +393,7 @@
 	 * <em>Property String Value</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.PropertyStringValueImpl
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getPropertyStringValue()
 	 * @generated
@@ -406,7 +404,7 @@
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -416,7 +414,7 @@
 	 * The number of structural features of the '<em>Property String Value</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -427,7 +425,7 @@
 	 * <em>EMF Store Property Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStorePropertyType
 	 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getEMFStorePropertyType()
 	 * @generated
@@ -435,11 +433,11 @@
 	int EMF_STORE_PROPERTY_TYPE = 10;
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.common.model.Project
-	 * <em>Project</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.common.model.Project <em>Project</em>
+	 * }'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Project</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.Project
 	 * @generated
@@ -451,7 +449,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.Project#getModelElements <em>Model Elements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Model Elements</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.Project#getModelElements()
 	 * @see #getProject()
@@ -464,7 +462,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.Project#getCutElements <em>Cut Elements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Cut Elements</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.Project#getCutElements()
 	 * @see #getProject()
@@ -477,7 +475,7 @@
 	 * <em>Unique Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Unique Identifier</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier
 	 * @generated
@@ -486,11 +484,10 @@
 
 	/**
 	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier#getId
-	 * <em>Id</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier#getId()
 	 * @see #getUniqueIdentifier()
@@ -503,7 +500,7 @@
 	 * <em>Identifiable Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Identifiable Element</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement
 	 * @generated
@@ -515,7 +512,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement#getIdentifier <em>Identifier</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Identifier</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement#getIdentifier()
 	 * @see #getIdentifiableElement()
@@ -528,7 +525,7 @@
 	 * <em>Element Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Element Id</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelElementId
 	 * @generated
@@ -540,7 +537,7 @@
 	 * <em>Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Version</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelVersion
 	 * @generated
@@ -552,7 +549,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.ModelVersion#getReleaseNumber <em>Release Number</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Release Number</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelVersion#getReleaseNumber()
 	 * @see #getModelVersion()
@@ -565,7 +562,7 @@
 	 * <em>Non Domain Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Non Domain Element</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.NonDomainElement
 	 * @generated
@@ -577,7 +574,7 @@
 	 * <em>Association Class Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Association Class Element</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.AssociationClassElement
 	 * @generated
@@ -589,7 +586,7 @@
 	 * <em>EMF Store Property</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>EMF Store Property</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty
 	 * @generated
@@ -598,11 +595,10 @@
 
 	/**
 	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getKey
-	 * <em>Key</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getKey <em>Key</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Key</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getKey()
 	 * @see #getEMFStoreProperty()
@@ -615,7 +611,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Value</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getValue()
 	 * @see #getEMFStoreProperty()
@@ -625,11 +621,10 @@
 
 	/**
 	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getType
-	 * <em>Type</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getType <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getType()
 	 * @see #getEMFStoreProperty()
@@ -642,7 +637,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getVersion <em>Version</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Version</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty#getVersion()
 	 * @see #getEMFStoreProperty()
@@ -654,7 +649,7 @@
 	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Property Map Entry</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Property Map Entry</em>'.
 	 * @see java.util.Map.Entry
 	 * @model keyDataType="org.eclipse.emf.ecore.EString"
@@ -667,7 +662,7 @@
 	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Key</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getPropertyMapEntry()
@@ -679,7 +674,7 @@
 	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Value</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getPropertyMapEntry()
@@ -692,7 +687,7 @@
 	 * <em>Property String Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Property String Value</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue
 	 * @generated
@@ -704,7 +699,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue#getValue <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue#getValue()
 	 * @see #getPropertyStringValue()
@@ -717,7 +712,7 @@
 	 * <em>EMF Store Property Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for enum '<em>EMF Store Property Type</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStorePropertyType
 	 * @generated
@@ -728,7 +723,7 @@
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -744,7 +739,7 @@
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -753,7 +748,7 @@
 		 * <em>Project</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ProjectImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getProject()
 		 * @generated
@@ -764,7 +759,7 @@
 		 * The meta object literal for the '<em><b>Model Elements</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT__MODEL_ELEMENTS = eINSTANCE.getProject_ModelElements();
@@ -773,18 +768,18 @@
 		 * The meta object literal for the '<em><b>Cut Elements</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROJECT__CUT_ELEMENTS = eINSTANCE.getProject_CutElements();
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.UniqueIdentifierImpl
-		 * <em>Unique Identifier</em>}' class.
+		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.UniqueIdentifierImpl <em>Unique Identifier</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.UniqueIdentifierImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getUniqueIdentifier()
 		 * @generated
@@ -795,7 +790,7 @@
 		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute UNIQUE_IDENTIFIER__ID = eINSTANCE.getUniqueIdentifier_Id();
@@ -806,7 +801,7 @@
 		 * <em>Identifiable Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.IdentifiableElementImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getIdentifiableElement()
 		 * @generated
@@ -817,18 +812,17 @@
 		 * The meta object literal for the '<em><b>Identifier</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute IDENTIFIABLE_ELEMENT__IDENTIFIER = eINSTANCE.getIdentifiableElement_Identifier();
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.ModelElementIdImpl
-		 * <em>Element Id</em>}' class.
+		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.ModelElementIdImpl <em>Element Id</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelElementIdImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getModelElementId()
 		 * @generated
@@ -840,7 +834,7 @@
 		 * <em>Version</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelVersionImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getModelVersion()
 		 * @generated
@@ -851,7 +845,7 @@
 		 * The meta object literal for the '<em><b>Release Number</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MODEL_VERSION__RELEASE_NUMBER = eINSTANCE.getModelVersion_ReleaseNumber();
@@ -861,7 +855,7 @@
 		 * <em>Non Domain Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.NonDomainElement
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getNonDomainElement()
 		 * @generated
@@ -874,7 +868,7 @@
 		 * <em>Association Class Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.AssociationClassElement
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getAssociationClassElement()
 		 * @generated
@@ -883,11 +877,11 @@
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl
-		 * <em>EMF Store Property</em>}' class.
+		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl <em>EMF Store Property</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.EMFStorePropertyImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getEMFStoreProperty()
 		 * @generated
@@ -898,7 +892,7 @@
 		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute EMF_STORE_PROPERTY__KEY = eINSTANCE.getEMFStoreProperty_Key();
@@ -907,7 +901,7 @@
 		 * The meta object literal for the '<em><b>Value</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference EMF_STORE_PROPERTY__VALUE = eINSTANCE.getEMFStoreProperty_Value();
@@ -916,7 +910,7 @@
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute EMF_STORE_PROPERTY__TYPE = eINSTANCE.getEMFStoreProperty_Type();
@@ -925,18 +919,18 @@
 		 * The meta object literal for the '<em><b>Version</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute EMF_STORE_PROPERTY__VERSION = eINSTANCE.getEMFStoreProperty_Version();
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl
-		 * <em>Property Map Entry</em>}' class.
+		 * {@link org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl <em>Property Map Entry</em>}'
+		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.PropertyMapEntryImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getPropertyMapEntry()
 		 * @generated
@@ -947,7 +941,7 @@
 		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROPERTY_MAP_ENTRY__KEY = eINSTANCE.getPropertyMapEntry_Key();
@@ -956,7 +950,7 @@
 		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PROPERTY_MAP_ENTRY__VALUE = eINSTANCE.getPropertyMapEntry_Value();
@@ -967,7 +961,7 @@
 		 * <em>Property String Value</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.PropertyStringValueImpl
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getPropertyStringValue()
 		 * @generated
@@ -978,7 +972,7 @@
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PROPERTY_STRING_VALUE__VALUE = eINSTANCE.getPropertyStringValue_Value();
@@ -988,7 +982,7 @@
 		 * <em>EMF Store Property Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStorePropertyType
 		 * @see org.eclipse.emf.emfstore.internal.common.model.impl.ModelPackageImpl#getEMFStorePropertyType()
 		 * @generated
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..5713a16 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
@@ -35,7 +35,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Release Number</em>' attribute.
 	 * @see #setReleaseNumber(int)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getModelVersion_ReleaseNumber()
@@ -48,7 +48,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.common.model.ModelVersion#getReleaseNumber
 	 * <em>Release Number</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Release Number</em>' attribute.
 	 * @see #getReleaseNumber()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/Project.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/Project.java
index 2b2a90b..71b0f65 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/Project.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/Project.java
@@ -46,7 +46,7 @@
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Model Elements</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getProject_ModelElements()
 	 * @model containment="true" resolveProxies="true" ordered="false"
@@ -63,7 +63,7 @@
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Cut Elements</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getProject_CutElements()
 	 * @model containment="true" resolveProxies="true"
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..44142eb 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
@@ -37,7 +37,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Value</em>' attribute.
 	 * @see #setValue(String)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getPropertyStringValue_Value()
@@ -48,11 +48,10 @@
 
 	/**
 	 * 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 -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Value</em>' attribute.
 	 * @see #getValue()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/UniqueIdentifier.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/UniqueIdentifier.java
index 30cd810..c6e5032 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/UniqueIdentifier.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/UniqueIdentifier.java
@@ -36,7 +36,7 @@
 	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage#getUniqueIdentifier_Id()
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..9f8614c 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
  */
@@ -43,7 +43,7 @@
 	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getKey()
 	 * @generated
 	 * @ordered
@@ -54,7 +54,7 @@
 	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getKey()
 	 * @generated
 	 * @ordered
@@ -65,7 +65,7 @@
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -76,7 +76,7 @@
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -87,7 +87,7 @@
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -98,7 +98,7 @@
 	 * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getVersion()
 	 * @generated
 	 * @ordered
@@ -109,7 +109,7 @@
 	 * The cached value of the '{@link #getVersion() <em>Version</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getVersion()
 	 * @generated
 	 * @ordered
@@ -119,7 +119,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected EMFStorePropertyImpl() {
@@ -129,7 +129,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,7 +140,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getKey() {
@@ -150,42 +150,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setKey(String newKey) {
-		final String oldKey = key;
+		String oldKey = key;
 		key = newKey;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__KEY, oldKey, key));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EObject getValue() {
 		if (value != null && value.eIsProxy()) {
-			final InternalEObject oldValue = (InternalEObject) value;
+			InternalEObject oldValue = (InternalEObject) value;
 			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);
+				InternalEObject newValue = (InternalEObject) value;
+				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);
 				}
-				if (msgs != null) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.EMF_STORE_PROPERTY__VALUE,
 						oldValue, value));
-				}
 			}
 		}
 		return value;
@@ -194,7 +191,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EObject basicGetValue() {
@@ -204,20 +201,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetValue(EObject newValue, NotificationChain msgs) {
-		final EObject oldValue = value;
+		EObject oldValue = value;
 		value = newValue;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ModelPackage.EMF_STORE_PROPERTY__VALUE, oldValue, newValue);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -225,34 +221,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setValue(EObject newValue) {
 		if (newValue != value) {
 			NotificationChain msgs = null;
-			if (value != null) {
-				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);
-			}
+			if (value != null)
+				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 = basicSetValue(newValue, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		} else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__VALUE, newValue,
 				newValue));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStorePropertyType getType() {
@@ -262,21 +254,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setType(EMFStorePropertyType newType) {
-		final EMFStorePropertyType oldType = type;
+		EMFStorePropertyType oldType = type;
 		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__TYPE, oldType, type));
-		}
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__TYPE, oldType, type));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getVersion() {
@@ -286,22 +278,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setVersion(int newVersion) {
-		final int oldVersion = version;
+		int oldVersion = version;
 		version = newVersion;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.EMF_STORE_PROPERTY__VERSION, oldVersion,
 				version));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -316,7 +307,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,9 +316,8 @@
 		case ModelPackage.EMF_STORE_PROPERTY__KEY:
 			return getKey();
 		case ModelPackage.EMF_STORE_PROPERTY__VALUE:
-			if (resolve) {
+			if (resolve)
 				return getValue();
-			}
 			return basicGetValue();
 		case ModelPackage.EMF_STORE_PROPERTY__TYPE:
 			return getType();
@@ -340,7 +330,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -365,7 +355,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -390,7 +380,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -411,16 +401,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (key: "); //$NON-NLS-1$
 		result.append(key);
 		result.append(", type: "); //$NON-NLS-1$
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..a705e44 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
  */
@@ -36,7 +36,7 @@
 	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -47,7 +47,7 @@
 	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @see #getIdentifier()
 	 * @generated
 	 * @ordered
@@ -66,7 +66,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> . <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,7 +76,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getIdentifier() {
@@ -85,21 +85,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setIdentifier(String newIdentifier) {
-		final String oldIdentifier = identifier;
+		String oldIdentifier = identifier;
 		identifier = newIdentifier;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.IDENTIFIABLE_ELEMENT__IDENTIFIER,
 				oldIdentifier, identifier));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,7 +112,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,7 +127,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -143,7 +142,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -157,16 +156,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (identifier: "); //$NON-NLS-1$
 		result.append(identifier);
 		result.append(')');
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..ea0de8b 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
  */
@@ -38,7 +36,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..e9b864c 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
@@ -30,7 +30,7 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelFactoryImpl extends EFactoryImpl implements ModelFactory {
@@ -38,17 +38,16 @@
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static ModelFactory init() {
 		try {
-			final ModelFactory theModelFactory = (ModelFactory) EPackage.Registry.INSTANCE
-				.getEFactory("http://eclipse.org/emf/emfstore/common/model"); //$NON-NLS-1$
+			ModelFactory theModelFactory = (ModelFactory) EPackage.Registry.INSTANCE.getEFactory(ModelPackage.eNS_URI);
 			if (theModelFactory != null) {
 				return theModelFactory;
 			}
-		} catch (final Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new ModelFactoryImpl();
@@ -58,7 +57,7 @@
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelFactoryImpl() {
@@ -67,7 +66,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -92,7 +91,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,7 +106,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -122,83 +121,81 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Project createProject() {
-		final ProjectImpl project = new ProjectImpl();
+		ProjectImpl project = new ProjectImpl();
 		return project;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelElementId createModelElementId() {
-		final ModelElementIdImpl modelElementId = new ModelElementIdImpl();
+		ModelElementIdImpl modelElementId = new ModelElementIdImpl();
 		return modelElementId;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelVersion createModelVersion() {
-		final ModelVersionImpl modelVersion = new ModelVersionImpl();
+		ModelVersionImpl modelVersion = new ModelVersionImpl();
 		return modelVersion;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStoreProperty createEMFStoreProperty() {
-		final EMFStorePropertyImpl emfStoreProperty = new EMFStorePropertyImpl();
+		EMFStorePropertyImpl emfStoreProperty = new EMFStorePropertyImpl();
 		return emfStoreProperty;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Map.Entry<String, EMFStoreProperty> createPropertyMapEntry() {
-		final PropertyMapEntryImpl propertyMapEntry = new PropertyMapEntryImpl();
+		PropertyMapEntryImpl propertyMapEntry = new PropertyMapEntryImpl();
 		return propertyMapEntry;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PropertyStringValue createPropertyStringValue() {
-		final PropertyStringValueImpl propertyStringValue = new PropertyStringValueImpl();
+		PropertyStringValueImpl propertyStringValue = new PropertyStringValueImpl();
 		return propertyStringValue;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStorePropertyType createEMFStorePropertyTypeFromString(EDataType eDataType, String initialValue) {
-		final EMFStorePropertyType result = EMFStorePropertyType.get(initialValue);
+		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$
-		}
+			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;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String convertEMFStorePropertyTypeToString(EDataType eDataType, Object instanceValue) {
@@ -207,7 +204,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelPackage getModelPackage() {
@@ -216,7 +213,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
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..3af5521 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
@@ -35,14 +35,14 @@
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ModelPackageImpl extends EPackageImpl implements ModelPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass projectEClass = null;
@@ -50,7 +50,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass uniqueIdentifierEClass = null;
@@ -58,7 +58,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass identifiableElementEClass = null;
@@ -66,7 +66,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass modelElementIdEClass = null;
@@ -74,7 +74,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass modelVersionEClass = null;
@@ -82,7 +82,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass nonDomainElementEClass = null;
@@ -90,7 +90,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass associationClassElementEClass = null;
@@ -98,7 +98,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass emfStorePropertyEClass = null;
@@ -106,7 +106,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass propertyMapEntryEClass = null;
@@ -114,7 +114,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass propertyStringValueEClass = null;
@@ -122,7 +122,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EEnum emfStorePropertyTypeEEnum = null;
@@ -148,33 +148,33 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
+	 * 
 	 * <p>
-	 * This method is used to initialize {@link 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
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static ModelPackage init() {
-		if (isInited) {
+		if (isInited)
 			return (ModelPackage) EPackage.Registry.INSTANCE.getEPackage(ModelPackage.eNS_URI);
-		}
 
 		// 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());
+		ModelPackageImpl theModelPackage = (ModelPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof ModelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new ModelPackageImpl());
 
 		isInited = true;
 
@@ -195,7 +195,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getProject() {
@@ -205,7 +205,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProject_ModelElements() {
@@ -215,7 +215,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getProject_CutElements() {
@@ -225,7 +225,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getUniqueIdentifier() {
@@ -235,7 +235,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUniqueIdentifier_Id() {
@@ -245,7 +245,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getIdentifiableElement() {
@@ -255,7 +255,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getIdentifiableElement_Identifier() {
@@ -265,7 +265,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getModelElementId() {
@@ -275,7 +275,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getModelVersion() {
@@ -285,7 +285,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getModelVersion_ReleaseNumber() {
@@ -295,7 +295,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getNonDomainElement() {
@@ -305,7 +305,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getAssociationClassElement() {
@@ -315,7 +315,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getEMFStoreProperty() {
@@ -325,7 +325,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEMFStoreProperty_Key() {
@@ -335,7 +335,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getEMFStoreProperty_Value() {
@@ -345,7 +345,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEMFStoreProperty_Type() {
@@ -355,7 +355,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEMFStoreProperty_Version() {
@@ -365,7 +365,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getPropertyMapEntry() {
@@ -375,7 +375,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPropertyMapEntry_Key() {
@@ -385,7 +385,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getPropertyMapEntry_Value() {
@@ -395,7 +395,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getPropertyStringValue() {
@@ -405,7 +405,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPropertyStringValue_Value() {
@@ -415,7 +415,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EEnum getEMFStorePropertyType() {
@@ -425,7 +425,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelFactory getModelFactory() {
@@ -435,7 +435,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -445,13 +445,12 @@
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -494,7 +493,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -504,13 +503,12 @@
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -523,17 +521,17 @@
 		// Set bounds for type parameters
 
 		// Add supertypes to classes
-		modelElementIdEClass.getESuperTypes().add(getUniqueIdentifier());
+		modelElementIdEClass.getESuperTypes().add(this.getUniqueIdentifier());
 		propertyStringValueEClass.getESuperTypes().add(ecorePackage.getEObject());
 
 		// 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 +557,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);
@@ -569,7 +567,7 @@
 		initEReference(getEMFStoreProperty_Value(), ecorePackage.getEObject(), null, "value", null, 0, 1, //$NON-NLS-1$
 			EMFStoreProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getEMFStoreProperty_Type(), getEMFStorePropertyType(), "type", null, 0, 1, //$NON-NLS-1$
+		initEAttribute(getEMFStoreProperty_Type(), this.getEMFStorePropertyType(), "type", null, 0, 1, //$NON-NLS-1$
 			EMFStoreProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 		initEAttribute(getEMFStoreProperty_Version(), ecorePackage.getEInt(), "version", null, 0, 1, //$NON-NLS-1$
@@ -580,7 +578,7 @@
 			!IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPropertyMapEntry_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPropertyMapEntry_Value(), getEMFStoreProperty(), null, "value", null, 0, 1, //$NON-NLS-1$
+		initEReference(getPropertyMapEntry_Value(), this.getEMFStoreProperty(), null, "value", null, 0, 1, //$NON-NLS-1$
 			Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
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..c9ec622 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
  */
@@ -34,7 +34,7 @@
 	 * The default value of the '{@link #getReleaseNumber() <em>Release Number</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getReleaseNumber()
 	 * @generated
 	 * @ordered
@@ -45,7 +45,7 @@
 	 * The cached value of the '{@link #getReleaseNumber() <em>Release Number</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getReleaseNumber()
 	 * @generated
 	 * @ordered
@@ -54,7 +54,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ModelVersionImpl() {
@@ -63,7 +63,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,7 +73,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getReleaseNumber() {
@@ -82,21 +82,20 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setReleaseNumber(int newReleaseNumber) {
-		final int oldReleaseNumber = releaseNumber;
+		int oldReleaseNumber = releaseNumber;
 		releaseNumber = newReleaseNumber;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.MODEL_VERSION__RELEASE_NUMBER,
 				oldReleaseNumber, releaseNumber));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -110,7 +109,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -125,7 +124,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,7 +139,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,16 +153,15 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (releaseNumber: "); //$NON-NLS-1$
 		result.append(releaseNumber);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ProjectImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ProjectImpl.java
index a9cd4b7..eadbb28 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ProjectImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/ProjectImpl.java
@@ -38,7 +38,7 @@
 	 * The cached value of the '{@link #getModelElements() <em>Model Elements</em>}' containment reference list.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getModelElements()
 	 * @generated
 	 * @ordered
@@ -48,7 +48,7 @@
 	/**
 	 * The cached value of the '{@link #getCutElements() <em>Cut Elements</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getCutElements()
 	 * @generated
 	 * @ordered
@@ -70,7 +70,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> .<!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,7 +80,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 
@@ -95,7 +95,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<EObject> getCutElements() {
@@ -108,7 +108,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -124,7 +124,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,7 +140,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -161,7 +161,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,7 +179,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..7d8548c 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
  */
@@ -40,7 +41,7 @@
 	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -51,7 +52,7 @@
 	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -62,7 +63,7 @@
 	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -72,7 +73,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PropertyMapEntryImpl() {
@@ -82,7 +83,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -93,7 +94,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getTypedKey() {
@@ -103,32 +104,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedKey(String newKey) {
-		final String oldKey = key;
+		String oldKey = key;
 		key = newKey;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROPERTY_MAP_ENTRY__KEY, oldKey, key));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStoreProperty getTypedValue() {
 		if (value != null && value.eIsProxy()) {
-			final InternalEObject oldValue = (InternalEObject) value;
+			InternalEObject oldValue = (InternalEObject) value;
 			value = (EMFStoreProperty) eResolveProxy(oldValue);
 			if (value != oldValue) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ModelPackage.PROPERTY_MAP_ENTRY__VALUE,
 						oldValue, value));
-				}
 			}
 		}
 		return value;
@@ -137,7 +136,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStoreProperty basicGetTypedValue() {
@@ -147,22 +146,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedValue(EMFStoreProperty newValue) {
-		final EMFStoreProperty oldValue = value;
+		EMFStoreProperty oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROPERTY_MAP_ENTRY__VALUE, oldValue,
-				value));
-		}
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, ModelPackage.PROPERTY_MAP_ENTRY__VALUE, oldValue, value));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -171,9 +169,8 @@
 		case ModelPackage.PROPERTY_MAP_ENTRY__KEY:
 			return getTypedKey();
 		case ModelPackage.PROPERTY_MAP_ENTRY__VALUE:
-			if (resolve) {
+			if (resolve)
 				return getTypedValue();
-			}
 			return basicGetTypedValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -182,7 +179,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -201,7 +198,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -220,7 +217,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -237,16 +234,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (key: "); //$NON-NLS-1$
 		result.append(key);
 		result.append(')');
@@ -256,7 +252,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected int hash = -1;
@@ -264,13 +260,13 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getHash() {
 		if (hash == -1) {
-			final Object theKey = getKey();
-			hash = theKey == null ? 0 : theKey.hashCode();
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
 		}
 		return hash;
 	}
@@ -278,7 +274,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setHash(int hash) {
@@ -288,7 +284,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getKey() {
@@ -298,7 +294,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setKey(String key) {
@@ -308,7 +304,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStoreProperty getValue() {
@@ -318,11 +314,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMFStoreProperty setValue(EMFStoreProperty value) {
-		final EMFStoreProperty oldValue = getValue();
+		EMFStoreProperty oldValue = getValue();
 		setTypedValue(value);
 		return oldValue;
 	}
@@ -330,12 +326,12 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	public EMap<String, EMFStoreProperty> getEMap() {
-		final EObject container = eContainer();
+		EObject container = eContainer();
 		return container == null ? null : (EMap<String, EMFStoreProperty>) container.eGet(eContainmentFeature());
 	}
 
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..1d954de 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
  */
@@ -35,7 +35,7 @@
 	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -46,7 +46,7 @@
 	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getValue()
 	 * @generated
 	 * @ordered
@@ -56,7 +56,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PropertyStringValueImpl() {
@@ -66,7 +66,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,7 +77,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getValue() {
@@ -87,22 +87,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setValue(String newValue) {
-		final String oldValue = value;
+		String oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.PROPERTY_STRING_VALUE__VALUE, oldValue,
 				value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -117,7 +116,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,7 +132,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,7 +148,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -164,16 +163,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: "); //$NON-NLS-1$
 		result.append(value);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/UniqueIdentifierImpl.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/UniqueIdentifierImpl.java
index 4f04ed2..b4dda7b 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/UniqueIdentifierImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/impl/UniqueIdentifierImpl.java
@@ -34,7 +34,7 @@
 	/**
 	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -44,7 +44,7 @@
 	/**
 	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getId()
 	 * @generated
 	 * @ordered
@@ -66,7 +66,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,7 +76,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -85,20 +85,19 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
-		final String oldId = id;
+		String oldId = id;
 		id = newId;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ModelPackage.UNIQUE_IDENTIFIER__ID, oldId, id));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,7 +111,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,7 +126,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -142,7 +141,7 @@
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
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..22442d2 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
@@ -31,7 +31,7 @@
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage
  * @generated
  */
@@ -39,7 +39,7 @@
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static ModelPackage modelPackage;
@@ -48,7 +48,7 @@
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelAdapterFactory() {
@@ -62,7 +62,7 @@
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -144,7 +144,7 @@
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
@@ -160,7 +160,7 @@
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.Project
 	 * @generated
@@ -171,13 +171,12 @@
 
 	/**
 	 * 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.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.UniqueIdentifier
 	 * @generated
@@ -188,13 +187,12 @@
 
 	/**
 	 * 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.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.IdentifiableElement
 	 * @generated
@@ -205,13 +203,12 @@
 
 	/**
 	 * 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.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.ModelElementId
 	 * @generated
@@ -238,13 +235,12 @@
 
 	/**
 	 * 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.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.NonDomainElement
 	 * @generated
@@ -261,7 +257,7 @@
 	 * default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases
 	 * anyway. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.AssociationClassElement
 	 * @generated
@@ -272,13 +268,12 @@
 
 	/**
 	 * 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.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.EMFStoreProperty
 	 * @generated
@@ -293,7 +288,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see java.util.Map.Entry
 	 * @generated
@@ -304,13 +299,12 @@
 
 	/**
 	 * 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.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.common.model.PropertyStringValue
 	 * @generated
@@ -323,7 +317,7 @@
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelSwitch.java b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelSwitch.java
index 804bb2e..43de43c 100644
--- a/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.common.model/src/org/eclipse/emf/emfstore/internal/common/model/util/ModelSwitch.java
@@ -36,7 +36,7 @@
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.common.model.ModelPackage
  * @generated
  */
@@ -45,7 +45,7 @@
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static ModelPackage modelPackage;
@@ -54,7 +54,7 @@
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ModelSwitch() {
@@ -68,7 +68,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -81,7 +81,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -89,7 +89,7 @@
 		if (theEClass.eContainer() == modelPackage) {
 			return doSwitch(theEClass.getClassifierID(), theEObject);
 		}
-		final List<EClass> eSuperTypes = theEClass.getESuperTypes();
+		List<EClass> eSuperTypes = theEClass.getESuperTypes();
 		return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
 	}
 
@@ -98,94 +98,83 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 		case ModelPackage.PROJECT: {
-			final Project project = (Project) theEObject;
+			Project project = (Project) theEObject;
 			T result = caseProject(project);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.UNIQUE_IDENTIFIER: {
-			final UniqueIdentifier uniqueIdentifier = (UniqueIdentifier) theEObject;
+			UniqueIdentifier uniqueIdentifier = (UniqueIdentifier) theEObject;
 			T result = caseUniqueIdentifier(uniqueIdentifier);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.IDENTIFIABLE_ELEMENT: {
-			final IdentifiableElement identifiableElement = (IdentifiableElement) theEObject;
+			IdentifiableElement identifiableElement = (IdentifiableElement) theEObject;
 			T result = caseIdentifiableElement(identifiableElement);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.MODEL_ELEMENT_ID: {
-			final ModelElementId modelElementId = (ModelElementId) theEObject;
+			ModelElementId modelElementId = (ModelElementId) theEObject;
 			T result = caseModelElementId(modelElementId);
-			if (result == null) {
+			if (result == null)
 				result = caseUniqueIdentifier(modelElementId);
-			}
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.MODEL_VERSION: {
-			final ModelVersion modelVersion = (ModelVersion) theEObject;
+			ModelVersion modelVersion = (ModelVersion) theEObject;
 			T result = caseModelVersion(modelVersion);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.NON_DOMAIN_ELEMENT: {
-			final NonDomainElement nonDomainElement = (NonDomainElement) theEObject;
+			NonDomainElement nonDomainElement = (NonDomainElement) theEObject;
 			T result = caseNonDomainElement(nonDomainElement);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.ASSOCIATION_CLASS_ELEMENT: {
-			final AssociationClassElement associationClassElement = (AssociationClassElement) theEObject;
+			AssociationClassElement associationClassElement = (AssociationClassElement) theEObject;
 			T result = caseAssociationClassElement(associationClassElement);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.EMF_STORE_PROPERTY: {
-			final EMFStoreProperty emfStoreProperty = (EMFStoreProperty) theEObject;
+			EMFStoreProperty emfStoreProperty = (EMFStoreProperty) theEObject;
 			T result = caseEMFStoreProperty(emfStoreProperty);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.PROPERTY_MAP_ENTRY: {
 			@SuppressWarnings("unchecked")
-			final Map.Entry<String, EMFStoreProperty> propertyMapEntry = (Map.Entry<String, EMFStoreProperty>) theEObject;
+			Map.Entry<String, EMFStoreProperty> propertyMapEntry = (Map.Entry<String, EMFStoreProperty>) theEObject;
 			T result = casePropertyMapEntry(propertyMapEntry);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ModelPackage.PROPERTY_STRING_VALUE: {
-			final PropertyStringValue propertyStringValue = (PropertyStringValue) theEObject;
+			PropertyStringValue propertyStringValue = (PropertyStringValue) theEObject;
 			T result = casePropertyStringValue(propertyStringValue);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		default:
@@ -199,7 +188,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Project</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -215,7 +204,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Unique Identifier</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -231,7 +220,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Identifiable Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -247,7 +236,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Element Id</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -263,7 +252,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Version</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -279,7 +268,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Non Domain Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -295,7 +284,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Association Class Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -311,7 +300,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EMF Store Property</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -327,7 +316,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Property Map Entry</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -343,7 +332,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Property String Value</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -359,7 +348,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
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..c9abff6 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
@@ -772,7 +772,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);
 
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..872367e 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
@@ -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.examplemodel.edit/icons/full/ctool16/CreateFan_fanMerchandise_Merchandise.gif b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/icons/full/ctool16/CreateFan_fanMerchandise_Merchandise.gif
new file mode 100644
index 0000000..d7724b6
--- /dev/null
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/icons/full/ctool16/CreateFan_fanMerchandise_Merchandise.gif
Binary files differ
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java
index 43551f5..7ffb1a7 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/AreaItemProvider.java
@@ -21,7 +21,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -33,16 +32,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Area} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class AreaItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public AreaItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +52,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,7 +70,7 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -87,7 +86,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -102,7 +101,7 @@
 	 * This returns Area.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,7 +113,7 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,7 +126,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -148,29 +147,25 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.AREA__AREAS,
-				BowlingFactory.eINSTANCE.createArea()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.AREA__AREAS,
+			BowlingFactory.eINSTANCE.createArea()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.AREA__TOURNAMENTS,
-				BowlingFactory.eINSTANCE.createTournament()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.AREA__TOURNAMENTS,
+			BowlingFactory.eINSTANCE.createTournament()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java
index 5249a24..8187953 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingEditPlugin.java
@@ -17,7 +17,7 @@
  * This is the central singleton for the Bowling edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public final class BowlingEditPlugin extends EMFPlugin {
@@ -25,7 +25,7 @@
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final BowlingEditPlugin INSTANCE = new BowlingEditPlugin();
@@ -34,7 +34,7 @@
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -43,19 +43,19 @@
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingEditPlugin() {
 		super(new ResourceLocator[] {
-			});
+		});
 	}
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -68,7 +68,7 @@
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -80,7 +80,7 @@
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
@@ -88,7 +88,7 @@
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingItemProviderAdapterFactory.java
index b3b0af1..77d3964 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/BowlingItemProviderAdapterFactory.java
@@ -37,7 +37,7 @@
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class BowlingItemProviderAdapterFactory extends BowlingAdapterFactory implements ComposeableAdapterFactory,
@@ -46,7 +46,7 @@
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -55,7 +55,7 @@
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,7 +64,7 @@
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -73,7 +73,7 @@
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingItemProviderAdapterFactory() {
@@ -88,7 +88,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Player} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PlayerItemProvider playerItemProvider;
@@ -97,7 +97,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Player}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,7 +113,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.League} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected LeagueItemProvider leagueItemProvider;
@@ -122,7 +122,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.League}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,7 +138,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Tournament} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TournamentItemProvider tournamentItemProvider;
@@ -147,7 +147,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Tournament}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -163,7 +163,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Matchup} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MatchupItemProvider matchupItemProvider;
@@ -172,7 +172,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Matchup}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -188,7 +188,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Game} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected GameItemProvider gameItemProvider;
@@ -197,7 +197,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Game}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -213,7 +213,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PlayerToPointsMapItemProvider playerToPointsMapItemProvider;
@@ -222,7 +222,7 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -238,7 +238,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Referee} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected RefereeItemProvider refereeItemProvider;
@@ -247,7 +247,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Referee}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -263,7 +263,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected RefereeToGamesMapItemProvider refereeToGamesMapItemProvider;
@@ -272,7 +272,7 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -288,7 +288,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Area} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AreaItemProvider areaItemProvider;
@@ -297,7 +297,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Area}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -313,7 +313,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Fan} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected FanItemProvider fanItemProvider;
@@ -322,7 +322,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Fan}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -338,7 +338,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.bowling.Merchandise} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MerchandiseItemProvider merchandiseItemProvider;
@@ -347,7 +347,7 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.bowling.Merchandise}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -363,7 +363,7 @@
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -374,7 +374,7 @@
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -384,7 +384,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -396,7 +396,7 @@
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -407,14 +407,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
 		if (isFactoryForType(type)) {
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -426,7 +426,7 @@
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -437,7 +437,7 @@
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -448,7 +448,7 @@
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
@@ -463,43 +463,32 @@
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (playerItemProvider != null) {
+		if (playerItemProvider != null)
 			playerItemProvider.dispose();
-		}
-		if (leagueItemProvider != null) {
+		if (leagueItemProvider != null)
 			leagueItemProvider.dispose();
-		}
-		if (tournamentItemProvider != null) {
+		if (tournamentItemProvider != null)
 			tournamentItemProvider.dispose();
-		}
-		if (matchupItemProvider != null) {
+		if (matchupItemProvider != null)
 			matchupItemProvider.dispose();
-		}
-		if (gameItemProvider != null) {
+		if (gameItemProvider != null)
 			gameItemProvider.dispose();
-		}
-		if (playerToPointsMapItemProvider != null) {
+		if (playerToPointsMapItemProvider != null)
 			playerToPointsMapItemProvider.dispose();
-		}
-		if (refereeItemProvider != null) {
+		if (refereeItemProvider != null)
 			refereeItemProvider.dispose();
-		}
-		if (refereeToGamesMapItemProvider != null) {
+		if (refereeToGamesMapItemProvider != null)
 			refereeToGamesMapItemProvider.dispose();
-		}
-		if (areaItemProvider != null) {
+		if (areaItemProvider != null)
 			areaItemProvider.dispose();
-		}
-		if (fanItemProvider != null) {
+		if (fanItemProvider != null)
 			fanItemProvider.dispose();
-		}
-		if (merchandiseItemProvider != null) {
+		if (merchandiseItemProvider != null)
 			merchandiseItemProvider.dispose();
-		}
 	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java
index 59c3c5a..8b9bcd8 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/FanItemProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -35,19 +34,19 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Fan} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class FanItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
 	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public FanItemProvider(AdapterFactory adapterFactory) {
@@ -58,7 +57,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,13 +82,12 @@
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_name_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_name_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -106,13 +104,12 @@
 	 * This adds a property descriptor for the Date Of Birth feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addDateOfBirthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_dateOfBirth_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_dateOfBirth_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -129,13 +126,12 @@
 	 * This adds a property descriptor for the Has Season Ticket feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addHasSeasonTicketPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_hasSeasonTicket_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_hasSeasonTicket_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -152,13 +148,12 @@
 	 * This adds a property descriptor for the EMails feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addEMailsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_eMails_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_eMails_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -175,13 +170,12 @@
 	 * This adds a property descriptor for the Gender feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addGenderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_gender_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_gender_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -198,13 +192,12 @@
 	 * This adds a property descriptor for the Favourite Player feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addFavouritePlayerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_favouritePlayer_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_favouritePlayer_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -221,13 +214,12 @@
 	 * This adds a property descriptor for the Visited Tournaments feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addVisitedTournamentsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_visitedTournaments_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_visitedTournaments_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -244,18 +236,16 @@
 	 * This adds a property descriptor for the Number Of Tournaments Visited feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNumberOfTournamentsVisitedPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_numberOfTournamentsVisited_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Fan_numberOfTournamentsVisited_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Fan_numberOfTournamentsVisited_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Fan_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.FAN__NUMBER_OF_TOURNAMENTS_VISITED,
 				true,
 				false,
@@ -269,13 +259,12 @@
 	 * This adds a property descriptor for the Money Spent On Tickets feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addMoneySpentOnTicketsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Fan_moneySpentOnTickets_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Fan_moneySpentOnTickets_feature", "_UI_Fan_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -294,7 +283,7 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -310,7 +299,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -325,7 +314,7 @@
 	 * This returns Fan.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -337,14 +326,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((Fan) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Fan_type") : //$NON-NLS-1$
+		String label = ((Fan) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_Fan_type") : //$NON-NLS-1$
 			getString("_UI_Fan_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -353,7 +341,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -383,39 +371,34 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.FAN__FAN_MERCHANDISE,
-				BowlingFactory.eINSTANCE.createMerchandise()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.FAN__FAN_MERCHANDISE,
+			BowlingFactory.eINSTANCE.createMerchandise()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE,
-				BowlingFactory.eINSTANCE.createMerchandise()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE,
+			BowlingFactory.eINSTANCE.createMerchandise()));
 	}
 
 	/**
 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		final Object childFeature = feature;
-		final Object childObject = child;
+		Object childFeature = feature;
+		Object childObject = child;
 
-		final boolean qualify =
-			childFeature == BowlingPackage.Literals.FAN__FAN_MERCHANDISE ||
-				childFeature == BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE;
+		boolean qualify = childFeature == BowlingPackage.Literals.FAN__FAN_MERCHANDISE ||
+			childFeature == BowlingPackage.Literals.FAN__FAVOURITE_MERCHANDISE;
 
 		if (qualify) {
 			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
@@ -428,7 +411,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java
index aab31f3..af0d019 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/GameItemProvider.java
@@ -21,7 +21,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -33,16 +32,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Game} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class GameItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public GameItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +52,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,13 +71,12 @@
 	 * This adds a property descriptor for the Matchup feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addMatchupPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Game_matchup_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Game_matchup_feature", "_UI_Game_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -95,13 +93,12 @@
 	 * This adds a property descriptor for the Player feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addPlayerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Game_player_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Game_player_feature", "_UI_Game_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -118,13 +115,12 @@
 	 * This adds a property descriptor for the Frames feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addFramesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Game_frames_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Game_frames_feature", "_UI_Game_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -141,7 +137,7 @@
 	 * This returns Game.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,7 +149,7 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,7 +162,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -186,7 +182,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,7 +194,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java
index 0ecd093..a2668ac 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/LeagueItemProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -35,16 +34,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.League} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class LeagueItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public LeagueItemProvider(AdapterFactory adapterFactory) {
@@ -55,7 +54,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,13 +72,12 @@
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_League_name_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_League_name_feature", "_UI_League_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -96,13 +94,12 @@
 	 * This adds a property descriptor for the Players feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addPlayersPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_League_players_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_League_players_feature", "_UI_League_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -121,7 +118,7 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,7 +133,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -151,7 +148,7 @@
 	 * This returns League.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -163,14 +160,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((League) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_League_type") : //$NON-NLS-1$
+		String label = ((League) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_League_type") : //$NON-NLS-1$
 			getString("_UI_League_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -179,7 +175,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -202,24 +198,22 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.LEAGUE__PLAYERS,
-				BowlingFactory.eINSTANCE.createPlayer()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.LEAGUE__PLAYERS,
+			BowlingFactory.eINSTANCE.createPlayer()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java
index 2e85ab0..b63827c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MatchupItemProvider.java
@@ -23,7 +23,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -36,16 +35,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Matchup} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class MatchupItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public MatchupItemProvider(AdapterFactory adapterFactory) {
@@ -56,7 +55,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -74,13 +73,12 @@
 	 * This adds a property descriptor for the Games feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addGamesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Matchup_games_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Matchup_games_feature", "_UI_Matchup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -97,14 +95,12 @@
 	 * This adds a property descriptor for the Nr Spectators feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNrSpectatorsPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Matchup_nrSpectators_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Matchup_nrSpectators_feature", "_UI_Matchup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -123,7 +119,7 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -138,7 +134,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -153,7 +149,7 @@
 	 * This returns Matchup.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -165,15 +161,14 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final BigInteger labelValue = ((Matchup) object).getNrSpectators();
-		final String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Matchup_type") : //$NON-NLS-1$
+		BigInteger labelValue = ((Matchup) object).getNrSpectators();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ? getString("_UI_Matchup_type") : //$NON-NLS-1$
 			getString("_UI_Matchup_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -182,7 +177,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -205,24 +200,22 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.MATCHUP__GAMES,
-				BowlingFactory.eINSTANCE.createGame()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.MATCHUP__GAMES,
+			BowlingFactory.eINSTANCE.createGame()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java
index dc1cdc9..0e32c5c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/MerchandiseItemProvider.java
@@ -21,7 +21,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -33,19 +32,19 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Merchandise} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class MerchandiseItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
 	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public MerchandiseItemProvider(AdapterFactory adapterFactory) {
@@ -56,7 +55,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,14 +74,12 @@
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Merchandise_name_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_name_feature", "_UI_Merchandise_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -99,17 +96,16 @@
 	 * This adds a property descriptor for the Price feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addPricePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Merchandise_price_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_price_feature", "_UI_Merchandise_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_price_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Merchandise_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.MERCHANDISE__PRICE,
 				true,
 				false,
@@ -123,18 +119,16 @@
 	 * This adds a property descriptor for the Serial Number feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addSerialNumberPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Merchandise_serialNumber_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Merchandise_serialNumber_feature", "_UI_Merchandise_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Merchandise_serialNumber_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Merchandise_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.MERCHANDISE__SERIAL_NUMBER,
 				true,
 				false,
@@ -148,7 +142,7 @@
 	 * This returns Merchandise.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,14 +154,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((Merchandise) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Merchandise_type") : //$NON-NLS-1$
+		String label = ((Merchandise) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_Merchandise_type") : //$NON-NLS-1$
 			getString("_UI_Merchandise_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -176,7 +169,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,7 +191,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -210,7 +203,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java
index 484160e..e50d882 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerItemProvider.java
@@ -21,7 +21,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -33,16 +32,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Player} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class PlayerItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PlayerItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +52,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,13 +77,12 @@
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_name_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_name_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -101,13 +99,12 @@
 	 * This adds a property descriptor for the Date Of Birth feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addDateOfBirthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_dateOfBirth_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_dateOfBirth_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -124,13 +121,12 @@
 	 * This adds a property descriptor for the Height feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_height_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_height_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -147,14 +143,12 @@
 	 * This adds a property descriptor for the Is Professional feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addIsProfessionalPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_isProfessional_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_isProfessional_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -171,13 +165,12 @@
 	 * This adds a property descriptor for the EMails feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addEMailsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_eMails_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_eMails_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -194,17 +187,16 @@
 	 * This adds a property descriptor for the Number Of Victories feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addNumberOfVictoriesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_numberOfVictories_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Player_numberOfVictories_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Player_numberOfVictories_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Player_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.PLAYER__NUMBER_OF_VICTORIES,
 				true,
 				false,
@@ -218,18 +210,16 @@
 	 * This adds a property descriptor for the Played Tournament Types feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addPlayedTournamentTypesPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_playedTournamentTypes_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Player_playedTournamentTypes_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Player_playedTournamentTypes_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Player_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.PLAYER__PLAYED_TOURNAMENT_TYPES,
 				true,
 				false,
@@ -243,13 +233,12 @@
 	 * This adds a property descriptor for the Win Loss Ratio feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addWinLossRatioPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_winLossRatio_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_winLossRatio_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -266,13 +255,12 @@
 	 * This adds a property descriptor for the Gender feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addGenderPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Player_gender_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Player_gender_feature", "_UI_Player_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -289,7 +277,7 @@
 	 * This returns Player.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -301,14 +289,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final String label = ((Player) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Player_type") : //$NON-NLS-1$
+		String label = ((Player) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_Player_type") : //$NON-NLS-1$
 			getString("_UI_Player_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -317,7 +304,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -345,7 +332,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -357,7 +344,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java
index 75114bf..d0cba17 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/PlayerToPointsMapItemProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -33,16 +32,16 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class PlayerToPointsMapItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public PlayerToPointsMapItemProvider(AdapterFactory adapterFactory) {
@@ -53,7 +52,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,18 +70,16 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_PlayerToPointsMap_key_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_key_feature", "_UI_PlayerToPointsMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_PlayerToPointsMap_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.PLAYER_TO_POINTS_MAP__KEY,
 				true,
 				false,
@@ -96,18 +93,16 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_PlayerToPointsMap_value_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_value_feature", "_UI_PlayerToPointsMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_PlayerToPointsMap_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_PlayerToPointsMap_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.PLAYER_TO_POINTS_MAP__VALUE,
 				true,
 				false,
@@ -121,7 +116,7 @@
 	 * This returns PlayerToPointsMap.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -133,12 +128,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final Map.Entry<?, ?> playerToPointsMap = (Map.Entry<?, ?>) object;
+		Map.Entry<?, ?> playerToPointsMap = (Map.Entry<?, ?>) object;
 		return "" + playerToPointsMap.getKey() + " -> " + playerToPointsMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -147,7 +142,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -167,7 +162,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,7 +174,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java
index 5adb322..df7707e 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeItemProvider.java
@@ -23,7 +23,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -35,16 +34,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Referee} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class RefereeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public RefereeItemProvider(AdapterFactory adapterFactory) {
@@ -55,7 +54,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,13 +72,12 @@
 	 * This adds a property descriptor for the Date Of Birth feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addDateOfBirthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Referee_dateOfBirth_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Referee_dateOfBirth_feature", "_UI_Referee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -96,13 +94,12 @@
 	 * This adds a property descriptor for the League feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addLeaguePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Referee_league_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Referee_league_feature", "_UI_Referee_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -119,7 +116,7 @@
 	 * This returns Referee.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -131,15 +128,14 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final XMLGregorianCalendar labelValue = ((Referee) object).getDateOfBirth();
-		final String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Referee_type") : //$NON-NLS-1$
+		XMLGregorianCalendar labelValue = ((Referee) object).getDateOfBirth();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ? getString("_UI_Referee_type") : //$NON-NLS-1$
 			getString("_UI_Referee_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -148,7 +144,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,7 +164,7 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,7 +176,7 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java
index 1b308b0..cf68485 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/RefereeToGamesMapItemProvider.java
@@ -23,7 +23,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -34,16 +33,16 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class RefereeToGamesMapItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public RefereeToGamesMapItemProvider(AdapterFactory adapterFactory) {
@@ -54,7 +53,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,18 +70,16 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_RefereeToGamesMap_value_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_RefereeToGamesMap_value_feature", "_UI_RefereeToGamesMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_RefereeToGamesMap_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_RefereeToGamesMap_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.REFEREE_TO_GAMES_MAP__VALUE,
 				true,
 				false,
@@ -98,7 +95,7 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,7 +110,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,7 +125,7 @@
 	 * This returns RefereeToGamesMap.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,12 +137,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final Map.Entry<?, ?> refereeToGamesMap = (Map.Entry<?, ?>) object;
+		Map.Entry<?, ?> refereeToGamesMap = (Map.Entry<?, ?>) object;
 		return "" + refereeToGamesMap.getKey() + " -> " + refereeToGamesMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -154,7 +151,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -174,24 +171,22 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP__KEY,
-				BowlingFactory.eINSTANCE.createReferee()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP__KEY,
+			BowlingFactory.eINSTANCE.createReferee()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java
index dad9210..6271cc8 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel.edit/src/org/eclipse/emf/emfstore/bowling/provider/TournamentItemProvider.java
@@ -22,7 +22,6 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -36,16 +35,16 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.bowling.Tournament} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TournamentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TournamentItemProvider(AdapterFactory adapterFactory) {
@@ -56,7 +55,7 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -78,17 +77,16 @@
 	 * This adds a property descriptor for the Matchups feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addMatchupsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Tournament_matchups_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Tournament_matchups_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_matchups_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Tournament_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.TOURNAMENT__MATCHUPS,
 				true,
 				false,
@@ -102,13 +100,12 @@
 	 * This adds a property descriptor for the Type feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Tournament_type_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_type_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -125,17 +122,16 @@
 	 * This adds a property descriptor for the Players feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addPlayersPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Tournament_players_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_players_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_players_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Tournament_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.TOURNAMENT__PLAYERS,
 				true,
 				false,
@@ -149,17 +145,16 @@
 	 * This adds a property descriptor for the Price Money feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addPriceMoneyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Tournament_priceMoney_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Tournament_priceMoney_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_priceMoney_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Tournament_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.TOURNAMENT__PRICE_MONEY,
 				true,
 				false,
@@ -173,18 +168,16 @@
 	 * This adds a property descriptor for the Receives Trophy feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addReceivesTrophyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Tournament_receivesTrophy_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Tournament_receivesTrophy_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_receivesTrophy_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Tournament_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.TOURNAMENT__RECEIVES_TROPHY,
 				true,
 				false,
@@ -198,17 +191,16 @@
 	 * This adds a property descriptor for the Match Days feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected void addMatchDaysPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_Tournament_matchDays_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Tournament_matchDays_feature", "_UI_Tournament_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_Tournament_matchDays_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Tournament_type"), //$NON-NLS-1$
 				BowlingPackage.Literals.TOURNAMENT__MATCH_DAYS,
 				true,
 				false,
@@ -224,7 +216,7 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -241,7 +233,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -256,7 +248,7 @@
 	 * This returns Tournament.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -268,15 +260,14 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
-		final TournamentType labelValue = ((Tournament) object).getType();
-		final String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Tournament_type") : //$NON-NLS-1$
+		TournamentType labelValue = ((Tournament) object).getType();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ? getString("_UI_Tournament_type") : //$NON-NLS-1$
 			getString("_UI_Tournament_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -285,7 +276,7 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -313,34 +304,28 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.TOURNAMENT__MATCHUPS,
-				BowlingFactory.eINSTANCE.createMatchup()));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.TOURNAMENT__MATCHUPS,
+			BowlingFactory.eINSTANCE.createMatchup()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.TOURNAMENT__PLAYER_POINTS,
-				BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.PLAYER_TO_POINTS_MAP)));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.TOURNAMENT__PLAYER_POINTS,
+			BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.PLAYER_TO_POINTS_MAP)));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(BowlingPackage.Literals.TOURNAMENT__REFEREES,
-				BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP)));
+		newChildDescriptors.add(createChildParameter(BowlingPackage.Literals.TOURNAMENT__REFEREES,
+			BowlingFactory.eINSTANCE.create(BowlingPackage.Literals.REFEREE_TO_GAMES_MAP)));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java
index 2cb454f..d031a76 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Area.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Area#getAreas <em>Areas</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Area#getTournaments <em>Tournaments</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getArea()
  * @model
@@ -40,7 +40,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Areas</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getArea_Areas()
 	 * @model containment="true" resolveProxies="true"
@@ -57,7 +57,7 @@
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Tournaments</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getArea_Tournaments()
 	 * @model containment="true" resolveProxies="true"
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingFactory.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingFactory.java
index 7932da0..02cf7cc 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingFactory.java
@@ -17,7 +17,7 @@
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage
  * @generated
  */
@@ -26,7 +26,7 @@
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	BowlingFactory eINSTANCE = org.eclipse.emf.emfstore.bowling.impl.BowlingFactoryImpl.init();
@@ -35,7 +35,7 @@
 	 * Returns a new object of class '<em>Player</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Player</em>'.
 	 * @generated
 	 */
@@ -45,7 +45,7 @@
 	 * Returns a new object of class '<em>League</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>League</em>'.
 	 * @generated
 	 */
@@ -55,7 +55,7 @@
 	 * Returns a new object of class '<em>Tournament</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Tournament</em>'.
 	 * @generated
 	 */
@@ -65,7 +65,7 @@
 	 * Returns a new object of class '<em>Matchup</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Matchup</em>'.
 	 * @generated
 	 */
@@ -75,7 +75,7 @@
 	 * Returns a new object of class '<em>Game</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Game</em>'.
 	 * @generated
 	 */
@@ -85,7 +85,7 @@
 	 * Returns a new object of class '<em>Referee</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Referee</em>'.
 	 * @generated
 	 */
@@ -95,7 +95,7 @@
 	 * Returns a new object of class '<em>Area</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Area</em>'.
 	 * @generated
 	 */
@@ -105,7 +105,7 @@
 	 * Returns a new object of class '<em>Fan</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Fan</em>'.
 	 * @generated
 	 */
@@ -115,7 +115,7 @@
 	 * Returns a new object of class '<em>Merchandise</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Merchandise</em>'.
 	 * @generated
 	 */
@@ -125,7 +125,7 @@
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java
index ae5a3c5..289b49d 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/BowlingPackage.java
@@ -28,7 +28,7 @@
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingFactory
  * @model kind="package"
  * @generated
@@ -38,7 +38,7 @@
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNAME = "bowling"; //$NON-NLS-1$
@@ -47,7 +47,7 @@
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://org/eclipse/example/bowling"; //$NON-NLS-1$
@@ -56,7 +56,7 @@
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.example.bowling"; //$NON-NLS-1$
@@ -65,7 +65,7 @@
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	BowlingPackage eINSTANCE = org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl.init();
@@ -74,7 +74,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl <em>Player</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.PlayerImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getPlayer()
 	 * @generated
@@ -85,7 +85,7 @@
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -95,7 +95,7 @@
 	 * The feature id for the '<em><b>Date Of Birth</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -105,7 +105,7 @@
 	 * The feature id for the '<em><b>Height</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -115,7 +115,7 @@
 	 * The feature id for the '<em><b>Is Professional</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -125,7 +125,7 @@
 	 * The feature id for the '<em><b>EMails</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -135,7 +135,7 @@
 	 * The feature id for the '<em><b>Number Of Victories</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -145,7 +145,7 @@
 	 * The feature id for the '<em><b>Played Tournament Types</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -155,7 +155,7 @@
 	 * The feature id for the '<em><b>Win Loss Ratio</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -165,7 +165,7 @@
 	 * The feature id for the '<em><b>Gender</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -175,7 +175,7 @@
 	 * The number of structural features of the '<em>Player</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -185,7 +185,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.LeagueImpl <em>League</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.LeagueImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getLeague()
 	 * @generated
@@ -196,7 +196,7 @@
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -206,7 +206,7 @@
 	 * The feature id for the '<em><b>Players</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -216,7 +216,7 @@
 	 * The number of structural features of the '<em>League</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -227,7 +227,7 @@
 	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.TournamentImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getTournament()
 	 * @generated
@@ -238,7 +238,7 @@
 	 * The feature id for the '<em><b>Matchups</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -248,7 +248,7 @@
 	 * The feature id for the '<em><b>Type</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -258,7 +258,7 @@
 	 * The feature id for the '<em><b>Player Points</b></em>' map.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -268,7 +268,7 @@
 	 * The feature id for the '<em><b>Players</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -278,7 +278,7 @@
 	 * The feature id for the '<em><b>Referees</b></em>' map.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -288,7 +288,7 @@
 	 * The feature id for the '<em><b>Price Money</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -298,7 +298,7 @@
 	 * The feature id for the '<em><b>Receives Trophy</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -308,7 +308,7 @@
 	 * The feature id for the '<em><b>Match Days</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -318,7 +318,7 @@
 	 * The number of structural features of the '<em>Tournament</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -328,7 +328,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.MatchupImpl <em>Matchup</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.MatchupImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getMatchup()
 	 * @generated
@@ -339,7 +339,7 @@
 	 * The feature id for the '<em><b>Games</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -349,7 +349,7 @@
 	 * The feature id for the '<em><b>Nr Spectators</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -359,7 +359,7 @@
 	 * The number of structural features of the '<em>Matchup</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -369,7 +369,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl <em>Game</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.GameImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getGame()
 	 * @generated
@@ -380,7 +380,7 @@
 	 * The feature id for the '<em><b>Matchup</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -390,7 +390,7 @@
 	 * The feature id for the '<em><b>Player</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -400,7 +400,7 @@
 	 * The feature id for the '<em><b>Frames</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -410,7 +410,7 @@
 	 * The number of structural features of the '<em>Game</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -421,7 +421,7 @@
 	 * <em>Player To Points Map</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.PlayerToPointsMapImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getPlayerToPointsMap()
 	 * @generated
@@ -432,7 +432,7 @@
 	 * The feature id for the '<em><b>Key</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -442,7 +442,7 @@
 	 * The feature id for the '<em><b>Value</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -452,7 +452,7 @@
 	 * The number of structural features of the '<em>Player To Points Map</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -462,7 +462,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.RefereeImpl <em>Referee</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.RefereeImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getReferee()
 	 * @generated
@@ -473,7 +473,7 @@
 	 * The feature id for the '<em><b>Date Of Birth</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -483,7 +483,7 @@
 	 * The feature id for the '<em><b>League</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -493,7 +493,7 @@
 	 * The number of structural features of the '<em>Referee</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -504,7 +504,7 @@
 	 * <em>Referee To Games Map</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.RefereeToGamesMapImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getRefereeToGamesMap()
 	 * @generated
@@ -515,7 +515,7 @@
 	 * The feature id for the '<em><b>Key</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -525,7 +525,7 @@
 	 * The feature id for the '<em><b>Value</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -535,7 +535,7 @@
 	 * The number of structural features of the '<em>Referee To Games Map</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -545,7 +545,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.AreaImpl <em>Area</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.AreaImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getArea()
 	 * @generated
@@ -556,7 +556,7 @@
 	 * The feature id for the '<em><b>Areas</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -566,7 +566,7 @@
 	 * The feature id for the '<em><b>Tournaments</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -576,7 +576,7 @@
 	 * The number of structural features of the '<em>Area</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -586,7 +586,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl <em>Fan</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.FanImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getFan()
 	 * @generated
@@ -597,7 +597,7 @@
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -607,7 +607,7 @@
 	 * The feature id for the '<em><b>Date Of Birth</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -617,7 +617,7 @@
 	 * The feature id for the '<em><b>Has Season Ticket</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -627,7 +627,7 @@
 	 * The feature id for the '<em><b>EMails</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -637,7 +637,7 @@
 	 * The feature id for the '<em><b>Gender</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -647,7 +647,7 @@
 	 * The feature id for the '<em><b>Favourite Player</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -657,7 +657,7 @@
 	 * The feature id for the '<em><b>Fan Merchandise</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -667,7 +667,7 @@
 	 * The feature id for the '<em><b>Favourite Merchandise</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -677,7 +677,7 @@
 	 * The feature id for the '<em><b>Visited Tournaments</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -687,7 +687,7 @@
 	 * The feature id for the '<em><b>Number Of Tournaments Visited</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -697,7 +697,7 @@
 	 * The feature id for the '<em><b>Money Spent On Tickets</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -707,7 +707,7 @@
 	 * The number of structural features of the '<em>Fan</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -718,7 +718,7 @@
 	 * class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getMerchandise()
 	 * @generated
@@ -729,7 +729,7 @@
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -739,7 +739,7 @@
 	 * The feature id for the '<em><b>Price</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -749,7 +749,7 @@
 	 * The feature id for the '<em><b>Serial Number</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -759,7 +759,7 @@
 	 * The number of structural features of the '<em>Merchandise</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -770,7 +770,7 @@
 	 * enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.TournamentType
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getTournamentType()
 	 * @generated
@@ -781,7 +781,7 @@
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.bowling.Gender <em>Gender</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.bowling.Gender
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getGender()
 	 * @generated
@@ -792,7 +792,7 @@
 	 * The meta object id for the '<em>XML Date</em>' data type.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see javax.xml.datatype.XMLGregorianCalendar
 	 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getXMLDate()
 	 * @generated
@@ -803,7 +803,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Player <em>Player</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Player</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player
 	 * @generated
@@ -815,7 +815,7 @@
 	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getName()
 	 * @see #getPlayer()
@@ -828,7 +828,7 @@
 	 * <em>Date Of Birth</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Date Of Birth</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getDateOfBirth()
 	 * @see #getPlayer()
@@ -841,7 +841,7 @@
 	 * <em>Height</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Height</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getHeight()
 	 * @see #getPlayer()
@@ -854,7 +854,7 @@
 	 * <em>Is Professional</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Is Professional</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#isIsProfessional()
 	 * @see #getPlayer()
@@ -867,7 +867,7 @@
 	 * <em>EMails</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>EMails</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getEMails()
 	 * @see #getPlayer()
@@ -880,7 +880,7 @@
 	 * <em>Number Of Victories</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Number Of Victories</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getNumberOfVictories()
 	 * @see #getPlayer()
@@ -893,7 +893,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Player#getPlayedTournamentTypes <em>Played Tournament Types</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>Played Tournament Types</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getPlayedTournamentTypes()
 	 * @see #getPlayer()
@@ -906,7 +906,7 @@
 	 * <em>Win Loss Ratio</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Win Loss Ratio</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getWinLossRatio()
 	 * @see #getPlayer()
@@ -919,7 +919,7 @@
 	 * <em>Gender</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Gender</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Player#getGender()
 	 * @see #getPlayer()
@@ -931,7 +931,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.League <em>League</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>League</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.League
 	 * @generated
@@ -943,7 +943,7 @@
 	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.League#getName()
 	 * @see #getLeague()
@@ -956,7 +956,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.League#getPlayers <em>Players</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Players</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.League#getPlayers()
 	 * @see #getLeague()
@@ -968,7 +968,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Tournament <em>Tournament</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Tournament</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament
 	 * @generated
@@ -980,7 +980,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Tournament#getMatchups <em>Matchups</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Matchups</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getMatchups()
 	 * @see #getTournament()
@@ -993,7 +993,7 @@
 	 * <em>Type</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Type</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getType()
 	 * @see #getTournament()
@@ -1006,7 +1006,7 @@
 	 * <em>Player Points</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the map '<em>Player Points</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getPlayerPoints()
 	 * @see #getTournament()
@@ -1019,7 +1019,7 @@
 	 * <em>Players</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>Players</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getPlayers()
 	 * @see #getTournament()
@@ -1032,7 +1032,7 @@
 	 * <em>Referees</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the map '<em>Referees</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getReferees()
 	 * @see #getTournament()
@@ -1045,7 +1045,7 @@
 	 * <em>Price Money</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>Price Money</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getPriceMoney()
 	 * @see #getTournament()
@@ -1058,7 +1058,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Tournament#getReceivesTrophy <em>Receives Trophy</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>Receives Trophy</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getReceivesTrophy()
 	 * @see #getTournament()
@@ -1071,7 +1071,7 @@
 	 * <em>Match Days</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>Match Days</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament#getMatchDays()
 	 * @see #getTournament()
@@ -1083,7 +1083,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Matchup <em>Matchup</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Matchup</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Matchup
 	 * @generated
@@ -1095,7 +1095,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Matchup#getGames <em>Games</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Games</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Matchup#getGames()
 	 * @see #getMatchup()
@@ -1108,7 +1108,7 @@
 	 * <em>Nr Spectators</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Nr Spectators</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Matchup#getNrSpectators()
 	 * @see #getMatchup()
@@ -1120,7 +1120,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Game <em>Game</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Game</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Game
 	 * @generated
@@ -1132,7 +1132,7 @@
 	 * <em>Matchup</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the container reference '<em>Matchup</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Game#getMatchup()
 	 * @see #getGame()
@@ -1141,11 +1141,11 @@
 	EReference getGame_Matchup();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer
-	 * <em>Player</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer <em>Player</em>
+	 * }'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Player</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Game#getPlayer()
 	 * @see #getGame()
@@ -1158,7 +1158,7 @@
 	 * <em>Frames</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>Frames</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Game#getFrames()
 	 * @see #getGame()
@@ -1170,7 +1170,7 @@
 	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Player To Points Map</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Player To Points Map</em>'.
 	 * @see java.util.Map.Entry
 	 * @model keyType="org.eclipse.emf.emfstore.bowling.Player"
@@ -1183,7 +1183,7 @@
 	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Key</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getPlayerToPointsMap()
@@ -1195,7 +1195,7 @@
 	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Value</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getPlayerToPointsMap()
@@ -1207,7 +1207,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Referee <em>Referee</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Referee</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Referee
 	 * @generated
@@ -1219,7 +1219,7 @@
 	 * <em>Date Of Birth</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Date Of Birth</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Referee#getDateOfBirth()
 	 * @see #getReferee()
@@ -1232,7 +1232,7 @@
 	 * <em>League</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>League</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Referee#getLeague()
 	 * @see #getReferee()
@@ -1244,7 +1244,7 @@
 	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Referee To Games Map</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Referee To Games Map</em>'.
 	 * @see java.util.Map.Entry
 	 * @model keyType="org.eclipse.emf.emfstore.bowling.Referee" keyContainment="true" keyResolveProxies="true"
@@ -1257,7 +1257,7 @@
 	 * Returns the meta object for the containment reference '{@link java.util.Map.Entry <em>Key</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Key</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getRefereeToGamesMap()
@@ -1269,7 +1269,7 @@
 	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Value</em>'.
 	 * @see java.util.Map.Entry
 	 * @see #getRefereeToGamesMap()
@@ -1281,7 +1281,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Area <em>Area</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Area</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Area
 	 * @generated
@@ -1289,11 +1289,11 @@
 	EClass getArea();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.emf.emfstore.bowling.Area#getAreas <em>Areas</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.emf.emfstore.bowling.Area#getAreas
+	 * <em>Areas</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Areas</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Area#getAreas()
 	 * @see #getArea()
@@ -1306,7 +1306,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Area#getTournaments <em>Tournaments</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Tournaments</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Area#getTournaments()
 	 * @see #getArea()
@@ -1318,7 +1318,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Fan <em>Fan</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Fan</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan
 	 * @generated
@@ -1329,7 +1329,7 @@
 	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.bowling.Fan#getName <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getName()
 	 * @see #getFan()
@@ -1342,7 +1342,7 @@
 	 * <em>Date Of Birth</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Date Of Birth</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getDateOfBirth()
 	 * @see #getFan()
@@ -1355,7 +1355,7 @@
 	 * <em>Has Season Ticket</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Has Season Ticket</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#isHasSeasonTicket()
 	 * @see #getFan()
@@ -1368,7 +1368,7 @@
 	 * <em>EMails</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute list '<em>EMails</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getEMails()
 	 * @see #getFan()
@@ -1381,7 +1381,7 @@
 	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Gender</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getGender()
 	 * @see #getFan()
@@ -1394,7 +1394,7 @@
 	 * <em>Favourite Player</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Favourite Player</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getFavouritePlayer()
 	 * @see #getFan()
@@ -1403,11 +1403,11 @@
 	EReference getFan_FavouritePlayer();
 
 	/**
-	 * Returns the meta object for the reference list '
-	 * {@link org.eclipse.emf.emfstore.bowling.Fan#getVisitedTournaments <em>Visited Tournaments</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.emf.emfstore.bowling.Fan#getVisitedTournaments
+	 * <em>Visited Tournaments</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>Visited Tournaments</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getVisitedTournaments()
 	 * @see #getFan()
@@ -1421,7 +1421,7 @@
 	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Number Of Tournaments Visited</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getNumberOfTournamentsVisited()
 	 * @see #getFan()
@@ -1434,7 +1434,7 @@
 	 * <em>Money Spent On Tickets</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Money Spent On Tickets</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getMoneySpentOnTickets()
 	 * @see #getFan()
@@ -1447,7 +1447,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Fan#getFanMerchandise <em>Fan Merchandise</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Fan Merchandise</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getFanMerchandise()
 	 * @see #getFan()
@@ -1460,7 +1460,7 @@
 	 * {@link org.eclipse.emf.emfstore.bowling.Fan#getFavouriteMerchandise <em>Favourite Merchandise</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Favourite Merchandise</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan#getFavouriteMerchandise()
 	 * @see #getFan()
@@ -1472,7 +1472,7 @@
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.bowling.Merchandise <em>Merchandise</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Merchandise</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Merchandise
 	 * @generated
@@ -1484,7 +1484,7 @@
 	 * <em>Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Merchandise#getName()
 	 * @see #getMerchandise()
@@ -1497,7 +1497,7 @@
 	 * <em>Price</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Price</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Merchandise#getPrice()
 	 * @see #getMerchandise()
@@ -1510,7 +1510,7 @@
 	 * <em>Serial Number</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Serial Number</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber()
 	 * @see #getMerchandise()
@@ -1519,11 +1519,11 @@
 	EAttribute getMerchandise_SerialNumber();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.emf.emfstore.bowling.TournamentType
-	 * <em>Tournament Type</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.emf.emfstore.bowling.TournamentType <em>Tournament Type</em>
+	 * }'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for enum '<em>Tournament Type</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.TournamentType
 	 * @generated
@@ -1534,7 +1534,7 @@
 	 * Returns the meta object for enum '{@link org.eclipse.emf.emfstore.bowling.Gender <em>Gender</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for enum '<em>Gender</em>'.
 	 * @see org.eclipse.emf.emfstore.bowling.Gender
 	 * @generated
@@ -1545,7 +1545,7 @@
 	 * Returns the meta object for data type '{@link javax.xml.datatype.XMLGregorianCalendar <em>XML Date</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for data type '<em>XML Date</em>'.
 	 * @see javax.xml.datatype.XMLGregorianCalendar
 	 * @model instanceClass="javax.xml.datatype.XMLGregorianCalendar"
@@ -1558,7 +1558,7 @@
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1574,7 +1574,7 @@
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -1583,7 +1583,7 @@
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.PlayerImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getPlayer()
 		 * @generated
@@ -1594,7 +1594,7 @@
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__NAME = eINSTANCE.getPlayer_Name();
@@ -1603,7 +1603,7 @@
 		 * The meta object literal for the '<em><b>Date Of Birth</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__DATE_OF_BIRTH = eINSTANCE.getPlayer_DateOfBirth();
@@ -1612,7 +1612,7 @@
 		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__HEIGHT = eINSTANCE.getPlayer_Height();
@@ -1621,7 +1621,7 @@
 		 * The meta object literal for the '<em><b>Is Professional</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__IS_PROFESSIONAL = eINSTANCE.getPlayer_IsProfessional();
@@ -1630,7 +1630,7 @@
 		 * The meta object literal for the '<em><b>EMails</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__EMAILS = eINSTANCE.getPlayer_EMails();
@@ -1639,7 +1639,7 @@
 		 * The meta object literal for the '<em><b>Number Of Victories</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__NUMBER_OF_VICTORIES = eINSTANCE.getPlayer_NumberOfVictories();
@@ -1648,7 +1648,7 @@
 		 * The meta object literal for the '<em><b>Played Tournament Types</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__PLAYED_TOURNAMENT_TYPES = eINSTANCE.getPlayer_PlayedTournamentTypes();
@@ -1657,7 +1657,7 @@
 		 * The meta object literal for the '<em><b>Win Loss Ratio</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__WIN_LOSS_RATIO = eINSTANCE.getPlayer_WinLossRatio();
@@ -1666,7 +1666,7 @@
 		 * The meta object literal for the '<em><b>Gender</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER__GENDER = eINSTANCE.getPlayer_Gender();
@@ -1676,7 +1676,7 @@
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.LeagueImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getLeague()
 		 * @generated
@@ -1687,7 +1687,7 @@
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute LEAGUE__NAME = eINSTANCE.getLeague_Name();
@@ -1696,7 +1696,7 @@
 		 * The meta object literal for the '<em><b>Players</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference LEAGUE__PLAYERS = eINSTANCE.getLeague_Players();
@@ -1706,7 +1706,7 @@
 		 * <em>Tournament</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.TournamentImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getTournament()
 		 * @generated
@@ -1717,7 +1717,7 @@
 		 * The meta object literal for the '<em><b>Matchups</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TOURNAMENT__MATCHUPS = eINSTANCE.getTournament_Matchups();
@@ -1726,7 +1726,7 @@
 		 * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TOURNAMENT__TYPE = eINSTANCE.getTournament_Type();
@@ -1735,7 +1735,7 @@
 		 * The meta object literal for the '<em><b>Player Points</b></em>' map feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TOURNAMENT__PLAYER_POINTS = eINSTANCE.getTournament_PlayerPoints();
@@ -1744,7 +1744,7 @@
 		 * The meta object literal for the '<em><b>Players</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TOURNAMENT__PLAYERS = eINSTANCE.getTournament_Players();
@@ -1753,7 +1753,7 @@
 		 * The meta object literal for the '<em><b>Referees</b></em>' map feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TOURNAMENT__REFEREES = eINSTANCE.getTournament_Referees();
@@ -1762,7 +1762,7 @@
 		 * The meta object literal for the '<em><b>Price Money</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TOURNAMENT__PRICE_MONEY = eINSTANCE.getTournament_PriceMoney();
@@ -1771,7 +1771,7 @@
 		 * The meta object literal for the '<em><b>Receives Trophy</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TOURNAMENT__RECEIVES_TROPHY = eINSTANCE.getTournament_ReceivesTrophy();
@@ -1780,7 +1780,7 @@
 		 * The meta object literal for the '<em><b>Match Days</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TOURNAMENT__MATCH_DAYS = eINSTANCE.getTournament_MatchDays();
@@ -1790,7 +1790,7 @@
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.MatchupImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getMatchup()
 		 * @generated
@@ -1801,7 +1801,7 @@
 		 * The meta object literal for the '<em><b>Games</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference MATCHUP__GAMES = eINSTANCE.getMatchup_Games();
@@ -1810,7 +1810,7 @@
 		 * The meta object literal for the '<em><b>Nr Spectators</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MATCHUP__NR_SPECTATORS = eINSTANCE.getMatchup_NrSpectators();
@@ -1819,7 +1819,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl <em>Game</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.GameImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getGame()
 		 * @generated
@@ -1830,7 +1830,7 @@
 		 * The meta object literal for the '<em><b>Matchup</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference GAME__MATCHUP = eINSTANCE.getGame_Matchup();
@@ -1839,7 +1839,7 @@
 		 * The meta object literal for the '<em><b>Player</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference GAME__PLAYER = eINSTANCE.getGame_Player();
@@ -1848,7 +1848,7 @@
 		 * The meta object literal for the '<em><b>Frames</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute GAME__FRAMES = eINSTANCE.getGame_Frames();
@@ -1858,7 +1858,7 @@
 		 * <em>Player To Points Map</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.PlayerToPointsMapImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getPlayerToPointsMap()
 		 * @generated
@@ -1869,7 +1869,7 @@
 		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference PLAYER_TO_POINTS_MAP__KEY = eINSTANCE.getPlayerToPointsMap_Key();
@@ -1878,7 +1878,7 @@
 		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute PLAYER_TO_POINTS_MAP__VALUE = eINSTANCE.getPlayerToPointsMap_Value();
@@ -1888,7 +1888,7 @@
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.RefereeImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getReferee()
 		 * @generated
@@ -1899,7 +1899,7 @@
 		 * The meta object literal for the '<em><b>Date Of Birth</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute REFEREE__DATE_OF_BIRTH = eINSTANCE.getReferee_DateOfBirth();
@@ -1908,7 +1908,7 @@
 		 * The meta object literal for the '<em><b>League</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference REFEREE__LEAGUE = eINSTANCE.getReferee_League();
@@ -1918,7 +1918,7 @@
 		 * <em>Referee To Games Map</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.RefereeToGamesMapImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getRefereeToGamesMap()
 		 * @generated
@@ -1929,7 +1929,7 @@
 		 * The meta object literal for the '<em><b>Key</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference REFEREE_TO_GAMES_MAP__KEY = eINSTANCE.getRefereeToGamesMap_Key();
@@ -1938,7 +1938,7 @@
 		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference REFEREE_TO_GAMES_MAP__VALUE = eINSTANCE.getRefereeToGamesMap_Value();
@@ -1947,7 +1947,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.bowling.impl.AreaImpl <em>Area</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.AreaImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getArea()
 		 * @generated
@@ -1958,7 +1958,7 @@
 		 * The meta object literal for the '<em><b>Areas</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference AREA__AREAS = eINSTANCE.getArea_Areas();
@@ -1967,7 +1967,7 @@
 		 * The meta object literal for the '<em><b>Tournaments</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference AREA__TOURNAMENTS = eINSTANCE.getArea_Tournaments();
@@ -1976,7 +1976,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl <em>Fan</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.FanImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getFan()
 		 * @generated
@@ -1987,7 +1987,7 @@
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__NAME = eINSTANCE.getFan_Name();
@@ -1996,7 +1996,7 @@
 		 * The meta object literal for the '<em><b>Date Of Birth</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__DATE_OF_BIRTH = eINSTANCE.getFan_DateOfBirth();
@@ -2005,7 +2005,7 @@
 		 * The meta object literal for the '<em><b>Has Season Ticket</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__HAS_SEASON_TICKET = eINSTANCE.getFan_HasSeasonTicket();
@@ -2014,7 +2014,7 @@
 		 * The meta object literal for the '<em><b>EMails</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__EMAILS = eINSTANCE.getFan_EMails();
@@ -2023,7 +2023,7 @@
 		 * The meta object literal for the '<em><b>Gender</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__GENDER = eINSTANCE.getFan_Gender();
@@ -2032,7 +2032,7 @@
 		 * The meta object literal for the '<em><b>Favourite Player</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference FAN__FAVOURITE_PLAYER = eINSTANCE.getFan_FavouritePlayer();
@@ -2041,7 +2041,7 @@
 		 * The meta object literal for the '<em><b>Visited Tournaments</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference FAN__VISITED_TOURNAMENTS = eINSTANCE.getFan_VisitedTournaments();
@@ -2050,7 +2050,7 @@
 		 * The meta object literal for the '<em><b>Number Of Tournaments Visited</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__NUMBER_OF_TOURNAMENTS_VISITED = eINSTANCE.getFan_NumberOfTournamentsVisited();
@@ -2059,7 +2059,7 @@
 		 * The meta object literal for the '<em><b>Money Spent On Tickets</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute FAN__MONEY_SPENT_ON_TICKETS = eINSTANCE.getFan_MoneySpentOnTickets();
@@ -2068,7 +2068,7 @@
 		 * The meta object literal for the '<em><b>Fan Merchandise</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference FAN__FAN_MERCHANDISE = eINSTANCE.getFan_FanMerchandise();
@@ -2077,7 +2077,7 @@
 		 * The meta object literal for the '<em><b>Favourite Merchandise</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference FAN__FAVOURITE_MERCHANDISE = eINSTANCE.getFan_FavouriteMerchandise();
@@ -2087,7 +2087,7 @@
 		 * <em>Merchandise</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getMerchandise()
 		 * @generated
@@ -2098,7 +2098,7 @@
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MERCHANDISE__NAME = eINSTANCE.getMerchandise_Name();
@@ -2107,7 +2107,7 @@
 		 * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MERCHANDISE__PRICE = eINSTANCE.getMerchandise_Price();
@@ -2116,7 +2116,7 @@
 		 * The meta object literal for the '<em><b>Serial Number</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MERCHANDISE__SERIAL_NUMBER = eINSTANCE.getMerchandise_SerialNumber();
@@ -2126,7 +2126,7 @@
 		 * <em>Tournament Type</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.TournamentType
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getTournamentType()
 		 * @generated
@@ -2137,7 +2137,7 @@
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.bowling.Gender <em>Gender</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.bowling.Gender
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getGender()
 		 * @generated
@@ -2148,7 +2148,7 @@
 		 * The meta object literal for the '<em>XML Date</em>' data type.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see javax.xml.datatype.XMLGregorianCalendar
 		 * @see org.eclipse.emf.emfstore.bowling.impl.BowlingPackageImpl#getXMLDate()
 		 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java
index 10b0ca4..36665fe 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Fan.java
@@ -22,6 +22,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Fan#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Fan#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -36,7 +37,6 @@
  * </li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Fan#getMoneySpentOnTickets <em>Money Spent On Tickets</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getFan()
  * @model
@@ -50,7 +50,7 @@
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #isSetName()
 	 * @see #unsetName()
@@ -65,7 +65,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #isSetName()
 	 * @see #unsetName()
@@ -78,7 +78,7 @@
 	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetName()
 	 * @see #getName()
 	 * @see #setName(String)
@@ -91,7 +91,7 @@
 	 * is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Name</em>' attribute is set.
 	 * @see #unsetName()
 	 * @see #getName()
@@ -108,7 +108,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Date Of Birth</em>' attribute.
 	 * @see #isSetDateOfBirth()
 	 * @see #unsetDateOfBirth()
@@ -124,7 +124,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Date Of Birth</em>' attribute.
 	 * @see #isSetDateOfBirth()
 	 * @see #unsetDateOfBirth()
@@ -138,7 +138,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetDateOfBirth()
 	 * @see #getDateOfBirth()
 	 * @see #setDateOfBirth(Date)
@@ -151,7 +151,7 @@
 	 * <em>Date Of Birth</em>}' attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Date Of Birth</em>' attribute is set.
 	 * @see #unsetDateOfBirth()
 	 * @see #getDateOfBirth()
@@ -168,7 +168,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Has Season Ticket</em>' attribute.
 	 * @see #isSetHasSeasonTicket()
 	 * @see #unsetHasSeasonTicket()
@@ -184,7 +184,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Has Season Ticket</em>' attribute.
 	 * @see #isSetHasSeasonTicket()
 	 * @see #unsetHasSeasonTicket()
@@ -194,11 +194,11 @@
 	void setHasSeasonTicket(boolean value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#isHasSeasonTicket
-	 * <em>Has Season Ticket</em>}' attribute.
+	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#isHasSeasonTicket <em>Has Season Ticket</em>
+	 * }' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetHasSeasonTicket()
 	 * @see #isHasSeasonTicket()
 	 * @see #setHasSeasonTicket(boolean)
@@ -211,7 +211,7 @@
 	 * <em>Has Season Ticket</em>}' attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Has Season Ticket</em>' attribute is set.
 	 * @see #unsetHasSeasonTicket()
 	 * @see #isHasSeasonTicket()
@@ -229,7 +229,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>EMails</em>' attribute list.
 	 * @see #isSetEMails()
 	 * @see #unsetEMails()
@@ -243,7 +243,7 @@
 	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getEMails <em>EMails</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetEMails()
 	 * @see #getEMails()
 	 * @generated
@@ -255,7 +255,7 @@
 	 * attribute list is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>EMails</em>' attribute list is set.
 	 * @see #unsetEMails()
 	 * @see #getEMails()
@@ -272,7 +272,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Gender</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.bowling.Gender
 	 * @see #isSetGender()
@@ -288,7 +288,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getGender <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Gender</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.bowling.Gender
 	 * @see #isSetGender()
@@ -302,7 +302,7 @@
 	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getGender <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetGender()
 	 * @see #getGender()
 	 * @see #setGender(Gender)
@@ -315,7 +315,7 @@
 	 * attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Gender</em>' attribute is set.
 	 * @see #unsetGender()
 	 * @see #getGender()
@@ -332,7 +332,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Favourite Player</em>' reference.
 	 * @see #isSetFavouritePlayer()
 	 * @see #unsetFavouritePlayer()
@@ -348,7 +348,7 @@
 	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Favourite Player</em>' reference.
 	 * @see #isSetFavouritePlayer()
 	 * @see #unsetFavouritePlayer()
@@ -358,11 +358,11 @@
 	void setFavouritePlayer(Player value);
 
 	/**
-	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getFavouritePlayer
-	 * <em>Favourite Player</em>}' reference.
+	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Fan#getFavouritePlayer <em>Favourite Player</em>
+	 * }' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetFavouritePlayer()
 	 * @see #getFavouritePlayer()
 	 * @see #setFavouritePlayer(Player)
@@ -375,7 +375,7 @@
 	 * <em>Favourite Player</em>}' reference is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Favourite Player</em>' reference is set.
 	 * @see #unsetFavouritePlayer()
 	 * @see #getFavouritePlayer()
@@ -393,7 +393,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Visited Tournaments</em>' reference list.
 	 * @see #isSetVisitedTournaments()
 	 * @see #unsetVisitedTournaments()
@@ -408,7 +408,7 @@
 	 * <em>Visited Tournaments</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetVisitedTournaments()
 	 * @see #getVisitedTournaments()
 	 * @generated
@@ -420,7 +420,7 @@
 	 * <em>Visited Tournaments</em>}' reference list is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Visited Tournaments</em>' reference list is set.
 	 * @see #unsetVisitedTournaments()
 	 * @see #getVisitedTournaments()
@@ -436,7 +436,7 @@
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Number Of Tournaments Visited</em>' attribute.
 	 * @see #isSetNumberOfTournamentsVisited()
 	 * @see #unsetNumberOfTournamentsVisited()
@@ -452,7 +452,7 @@
 	 * <em>Number Of Tournaments Visited</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Number Of Tournaments Visited</em>' attribute.
 	 * @see #isSetNumberOfTournamentsVisited()
 	 * @see #unsetNumberOfTournamentsVisited()
@@ -466,7 +466,7 @@
 	 * <em>Number Of Tournaments Visited</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetNumberOfTournamentsVisited()
 	 * @see #getNumberOfTournamentsVisited()
 	 * @see #setNumberOfTournamentsVisited(int)
@@ -479,7 +479,7 @@
 	 * <em>Number Of Tournaments Visited</em>}' attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Number Of Tournaments Visited</em>' attribute is set.
 	 * @see #unsetNumberOfTournamentsVisited()
 	 * @see #getNumberOfTournamentsVisited()
@@ -496,7 +496,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Money Spent On Tickets</em>' attribute.
 	 * @see #isSetMoneySpentOnTickets()
 	 * @see #unsetMoneySpentOnTickets()
@@ -512,7 +512,7 @@
 	 * <em>Money Spent On Tickets</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Money Spent On Tickets</em>' attribute.
 	 * @see #isSetMoneySpentOnTickets()
 	 * @see #unsetMoneySpentOnTickets()
@@ -526,7 +526,7 @@
 	 * <em>Money Spent On Tickets</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetMoneySpentOnTickets()
 	 * @see #getMoneySpentOnTickets()
 	 * @see #setMoneySpentOnTickets(double)
@@ -539,7 +539,7 @@
 	 * <em>Money Spent On Tickets</em>}' attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Money Spent On Tickets</em>' attribute is set.
 	 * @see #unsetMoneySpentOnTickets()
 	 * @see #getMoneySpentOnTickets()
@@ -557,7 +557,7 @@
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Fan Merchandise</em>' containment reference list.
 	 * @see #isSetFanMerchandise()
 	 * @see #unsetFanMerchandise()
@@ -572,7 +572,7 @@
 	 * containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetFanMerchandise()
 	 * @see #getFanMerchandise()
 	 * @generated
@@ -584,7 +584,7 @@
 	 * <em>Fan Merchandise</em>}' containment reference list is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Fan Merchandise</em>' containment reference list is set.
 	 * @see #unsetFanMerchandise()
 	 * @see #getFanMerchandise()
@@ -600,7 +600,7 @@
 	 * more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Favourite Merchandise</em>' containment reference.
 	 * @see #isSetFavouriteMerchandise()
 	 * @see #unsetFavouriteMerchandise()
@@ -616,7 +616,7 @@
 	 * <em>Favourite Merchandise</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Favourite Merchandise</em>' containment reference.
 	 * @see #isSetFavouriteMerchandise()
 	 * @see #unsetFavouriteMerchandise()
@@ -630,7 +630,7 @@
 	 * <em>Favourite Merchandise</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetFavouriteMerchandise()
 	 * @see #getFavouriteMerchandise()
 	 * @see #setFavouriteMerchandise(Merchandise)
@@ -643,7 +643,7 @@
 	 * <em>Favourite Merchandise</em>}' containment reference is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Favourite Merchandise</em>' containment reference is set.
 	 * @see #unsetFavouriteMerchandise()
 	 * @see #getFavouriteMerchandise()
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java
index 89bb95c..4b9c220 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Game.java
@@ -20,12 +20,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Game#getMatchup <em>Matchup</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer <em>Player</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Game#getFrames <em>Frames</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getGame()
  * @model
@@ -42,7 +42,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Matchup</em>' container reference.
 	 * @see #setMatchup(Matchup)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getGame_Matchup()
@@ -57,7 +57,7 @@
 	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Matchup</em>' container reference.
 	 * @see #getMatchup()
 	 * @generated
@@ -72,7 +72,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Player</em>' reference.
 	 * @see #setPlayer(Player)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getGame_Player()
@@ -85,7 +85,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Game#getPlayer <em>Player</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Player</em>' reference.
 	 * @see #getPlayer()
 	 * @generated
@@ -101,7 +101,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Frames</em>' attribute list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getGame_Frames()
 	 * @model unique="false" upper="10"
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java
index a04236e..9631a71 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Gender.java
@@ -21,7 +21,7 @@
  * A representation of the literals of the enumeration '<em><b>Gender</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getGender()
  * @model
  * @generated
@@ -31,7 +31,7 @@
 	 * The '<em><b>Female</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #FEMALE_VALUE
 	 * @generated
 	 * @ordered
@@ -42,7 +42,7 @@
 	 * The '<em><b>Male</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #MALE_VALUE
 	 * @generated
 	 * @ordered
@@ -57,7 +57,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #FEMALE
 	 * @model name="Female"
 	 * @generated
@@ -73,7 +73,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #MALE
 	 * @model name="Male"
 	 * @generated
@@ -85,20 +85,19 @@
 	 * An array of all the '<em><b>Gender</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	private static final Gender[] VALUES_ARRAY =
-		new Gender[] {
-			FEMALE,
-			MALE,
-		};
+	private static final Gender[] VALUES_ARRAY = new Gender[] {
+		FEMALE,
+		MALE,
+	};
 
 	/**
 	 * A public read-only list of all the '<em><b>Gender</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<Gender> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -107,12 +106,14 @@
 	 * Returns the '<em><b>Gender</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Gender get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final Gender result = VALUES_ARRAY[i];
+			Gender result = VALUES_ARRAY[i];
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -124,12 +125,14 @@
 	 * Returns the '<em><b>Gender</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Gender getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final Gender result = VALUES_ARRAY[i];
+			Gender result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -141,7 +144,9 @@
 	 * Returns the '<em><b>Gender</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static Gender get(int value) {
@@ -157,7 +162,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -165,7 +170,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -173,7 +178,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -182,7 +187,7 @@
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private Gender(int value, String name, String literal) {
@@ -194,7 +199,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
@@ -204,7 +209,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -214,7 +219,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
@@ -225,7 +230,7 @@
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java
index bfb7dcb..76dc98e 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/League.java
@@ -20,11 +20,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.League#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.League#getPlayers <em>Players</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getLeague()
  * @model
@@ -38,7 +38,7 @@
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getLeague_Name()
@@ -51,7 +51,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.League#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -67,7 +67,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Players</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getLeague_Players()
 	 * @model containment="true" resolveProxies="true"
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java
index ed327c5..0cccb6d 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Matchup.java
@@ -22,11 +22,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Matchup#getGames <em>Games</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Matchup#getNrSpectators <em>Nr Spectators</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMatchup()
  * @model
@@ -36,15 +36,15 @@
 	/**
 	 * Returns the value of the '<em><b>Games</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.emf.emfstore.bowling.Game}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.bowling.Game#getMatchup
-	 * <em>Matchup</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.bowling.Game#getMatchup <em>Matchup</em>
+	 * }'.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Games</em>' containment reference list isn't clear, there really should be more of a
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Games</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMatchup_Games()
 	 * @see org.eclipse.emf.emfstore.bowling.Game#getMatchup
@@ -61,7 +61,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Nr Spectators</em>' attribute.
 	 * @see #setNrSpectators(BigInteger)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMatchup_NrSpectators()
@@ -75,7 +75,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Nr Spectators</em>' attribute.
 	 * @see #getNrSpectators()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java
index 132a63f..7d824bd 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Merchandise.java
@@ -22,12 +22,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Merchandise#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Merchandise#getPrice <em>Price</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber <em>Serial Number</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMerchandise()
  * @model
@@ -41,7 +41,7 @@
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getMerchandise_Name()
@@ -54,7 +54,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -69,7 +69,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Price</em>' attribute.
 	 * @see #isSetPrice()
 	 * @see #unsetPrice()
@@ -84,7 +84,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getPrice <em>Price</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Price</em>' attribute.
 	 * @see #isSetPrice()
 	 * @see #unsetPrice()
@@ -97,7 +97,7 @@
 	 * Unsets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getPrice <em>Price</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetPrice()
 	 * @see #getPrice()
 	 * @see #setPrice(BigDecimal)
@@ -110,7 +110,7 @@
 	 * attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Price</em>' attribute is set.
 	 * @see #unsetPrice()
 	 * @see #getPrice()
@@ -127,7 +127,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Serial Number</em>' attribute.
 	 * @see #isSetSerialNumber()
 	 * @see #unsetSerialNumber()
@@ -139,11 +139,11 @@
 	BigInteger getSerialNumber();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber
-	 * <em>Serial Number</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Merchandise#getSerialNumber <em>Serial Number</em>
+	 * }' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Serial Number</em>' attribute.
 	 * @see #isSetSerialNumber()
 	 * @see #unsetSerialNumber()
@@ -157,7 +157,7 @@
 	 * <em>Serial Number</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isSetSerialNumber()
 	 * @see #getSerialNumber()
 	 * @see #setSerialNumber(BigInteger)
@@ -170,7 +170,7 @@
 	 * <em>Serial Number</em>}' attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether the value of the '<em>Serial Number</em>' attribute is set.
 	 * @see #unsetSerialNumber()
 	 * @see #getSerialNumber()
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java
index 03b9759..9895044 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Player.java
@@ -25,6 +25,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Player#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Player#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -36,7 +37,6 @@
  * <li>{@link org.eclipse.emf.emfstore.bowling.Player#getWinLossRatio <em>Win Loss Ratio</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Player#getGender <em>Gender</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer()
  * @model
@@ -50,7 +50,7 @@
 	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_Name()
@@ -63,7 +63,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Player#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
@@ -78,7 +78,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Date Of Birth</em>' attribute.
 	 * @see #setDateOfBirth(Date)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_DateOfBirth()
@@ -92,7 +92,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Date Of Birth</em>' attribute.
 	 * @see #getDateOfBirth()
 	 * @generated
@@ -107,7 +107,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Height</em>' attribute.
 	 * @see #setHeight(double)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_Height()
@@ -120,7 +120,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Player#getHeight <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Height</em>' attribute.
 	 * @see #getHeight()
 	 * @generated
@@ -135,7 +135,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Is Professional</em>' attribute.
 	 * @see #setIsProfessional(boolean)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_IsProfessional()
@@ -149,7 +149,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Is Professional</em>' attribute.
 	 * @see #isIsProfessional()
 	 * @generated
@@ -165,7 +165,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>EMails</em>' attribute list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_EMails()
 	 * @model required="true"
@@ -181,7 +181,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Number Of Victories</em>' attribute.
 	 * @see #setNumberOfVictories(int)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_NumberOfVictories()
@@ -195,7 +195,7 @@
 	 * <em>Number Of Victories</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Number Of Victories</em>' attribute.
 	 * @see #getNumberOfVictories()
 	 * @generated
@@ -212,7 +212,7 @@
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Played Tournament Types</em>' attribute list.
 	 * @see org.eclipse.emf.emfstore.bowling.TournamentType
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_PlayedTournamentTypes()
@@ -229,7 +229,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Win Loss Ratio</em>' attribute.
 	 * @see #setWinLossRatio(BigDecimal)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getPlayer_WinLossRatio()
@@ -243,7 +243,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Win Loss Ratio</em>' attribute.
 	 * @see #getWinLossRatio()
 	 * @generated
@@ -259,7 +259,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Gender</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.bowling.Gender
 	 * @see #setGender(Gender)
@@ -273,7 +273,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Player#getGender <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Gender</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.bowling.Gender
 	 * @see #getGender()
@@ -284,7 +284,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @model
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java
index 3f4e9b0..74d73a8 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Referee.java
@@ -21,11 +21,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Referee#getDateOfBirth <em>Date Of Birth</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Referee#getLeague <em>League</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getReferee()
  * @model
@@ -40,7 +40,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Date Of Birth</em>' attribute.
 	 * @see #setDateOfBirth(XMLGregorianCalendar)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getReferee_DateOfBirth()
@@ -54,7 +54,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Date Of Birth</em>' attribute.
 	 * @see #getDateOfBirth()
 	 * @generated
@@ -69,7 +69,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>League</em>' reference.
 	 * @see #setLeague(League)
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getReferee_League()
@@ -82,7 +82,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Referee#getLeague <em>League</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>League</em>' reference.
 	 * @see #getLeague()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java
index b18a4fa..8e30fab 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/Tournament.java
@@ -23,6 +23,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getMatchups <em>Matchups</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getType <em>Type</em>}</li>
@@ -33,7 +34,6 @@
  * <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getReceivesTrophy <em>Receives Trophy</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.Tournament#getMatchDays <em>Match Days</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament()
  * @model
@@ -49,7 +49,7 @@
 	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Matchups</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_Matchups()
 	 * @model containment="true" resolveProxies="true"
@@ -65,7 +65,7 @@
 	 * If the meaning of the '<em>Type</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.bowling.TournamentType
 	 * @see #setType(TournamentType)
@@ -79,7 +79,7 @@
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.bowling.Tournament#getType <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Type</em>' attribute.
 	 * @see org.eclipse.emf.emfstore.bowling.TournamentType
 	 * @see #getType()
@@ -97,7 +97,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Player Points</em>' map.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_PlayerPoints()
 	 * @model mapType=
@@ -115,7 +115,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Players</em>' reference list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_Players()
 	 * @model
@@ -132,7 +132,7 @@
 	 * If the meaning of the '<em>Referees</em>' map isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Referees</em>' map.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_Referees()
 	 * @model mapType=
@@ -150,7 +150,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Price Money</em>' attribute list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_PriceMoney()
 	 * @model unique="false"
@@ -167,7 +167,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Receives Trophy</em>' attribute list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_ReceivesTrophy()
 	 * @model unique="false"
@@ -184,7 +184,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Match Days</em>' attribute list.
 	 * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournament_MatchDays()
 	 * @model
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java
index da75708..50fa881 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/TournamentType.java
@@ -21,7 +21,7 @@
  * A representation of the literals of the enumeration '<em><b>Tournament Type</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage#getTournamentType()
  * @model
  * @generated
@@ -31,7 +31,7 @@
 	 * The '<em><b>Pro</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #PRO_VALUE
 	 * @generated
 	 * @ordered
@@ -42,7 +42,7 @@
 	 * The '<em><b>Amateur</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #AMATEUR_VALUE
 	 * @generated
 	 * @ordered
@@ -57,7 +57,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #PRO
 	 * @model name="Pro"
 	 * @generated
@@ -73,7 +73,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #AMATEUR
 	 * @model name="Amateur"
 	 * @generated
@@ -85,7 +85,7 @@
 	 * An array of all the '<em><b>Tournament Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static final TournamentType[] VALUES_ARRAY = new TournamentType[] {
@@ -97,7 +97,7 @@
 	 * A public read-only list of all the '<em><b>Tournament Type</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final List<TournamentType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -106,12 +106,14 @@
 	 * Returns the '<em><b>Tournament Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TournamentType get(String literal) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final TournamentType result = VALUES_ARRAY[i];
+			TournamentType result = VALUES_ARRAY[i];
 			if (result.toString().equals(literal)) {
 				return result;
 			}
@@ -123,12 +125,14 @@
 	 * Returns the '<em><b>Tournament Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TournamentType getByName(String name) {
 		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			final TournamentType result = VALUES_ARRAY[i];
+			TournamentType result = VALUES_ARRAY[i];
 			if (result.getName().equals(name)) {
 				return result;
 			}
@@ -140,7 +144,9 @@
 	 * Returns the '<em><b>Tournament Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static TournamentType get(int value) {
@@ -156,7 +162,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -164,7 +170,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -172,7 +178,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -181,7 +187,7 @@
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private TournamentType(int value, String name, String literal) {
@@ -193,7 +199,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
@@ -203,7 +209,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -213,7 +219,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
@@ -224,7 +230,7 @@
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java
index b158c19..e64d665 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/AreaImpl.java
@@ -29,11 +29,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.AreaImpl#getAreas <em>Areas</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.AreaImpl#getTournaments <em>Tournaments</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -42,7 +42,7 @@
 	 * The cached value of the '{@link #getAreas() <em>Areas</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getAreas()
 	 * @generated
 	 * @ordered
@@ -53,7 +53,7 @@
 	 * The cached value of the '{@link #getTournaments() <em>Tournaments</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTournaments()
 	 * @generated
 	 * @ordered
@@ -63,7 +63,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected AreaImpl() {
@@ -73,7 +73,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,7 +84,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Area> getAreas() {
@@ -97,7 +97,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Tournament> getTournaments() {
@@ -111,7 +111,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,7 +128,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -145,7 +145,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -167,7 +167,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -186,7 +186,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java
index 48830d5..ade439b 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingFactoryImpl.java
@@ -40,7 +40,7 @@
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class BowlingFactoryImpl extends EFactoryImpl implements BowlingFactory {
@@ -48,17 +48,17 @@
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static BowlingFactory init() {
 		try {
-			final BowlingFactory theBowlingFactory = (BowlingFactory) EPackage.Registry.INSTANCE
+			BowlingFactory theBowlingFactory = (BowlingFactory) EPackage.Registry.INSTANCE
 				.getEFactory(BowlingPackage.eNS_URI);
 			if (theBowlingFactory != null) {
 				return theBowlingFactory;
 			}
-		} catch (final Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new BowlingFactoryImpl();
@@ -68,7 +68,7 @@
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingFactoryImpl() {
@@ -78,7 +78,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,7 +114,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,7 +134,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,144 +154,142 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player createPlayer() {
-		final PlayerImpl player = new PlayerImpl();
+		PlayerImpl player = new PlayerImpl();
 		return player;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public League createLeague() {
-		final LeagueImpl league = new LeagueImpl();
+		LeagueImpl league = new LeagueImpl();
 		return league;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Tournament createTournament() {
-		final TournamentImpl tournament = new TournamentImpl();
+		TournamentImpl tournament = new TournamentImpl();
 		return tournament;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Matchup createMatchup() {
-		final MatchupImpl matchup = new MatchupImpl();
+		MatchupImpl matchup = new MatchupImpl();
 		return matchup;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Game createGame() {
-		final GameImpl game = new GameImpl();
+		GameImpl game = new GameImpl();
 		return game;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Map.Entry<Player, Integer> createPlayerToPointsMap() {
-		final PlayerToPointsMapImpl playerToPointsMap = new PlayerToPointsMapImpl();
+		PlayerToPointsMapImpl playerToPointsMap = new PlayerToPointsMapImpl();
 		return playerToPointsMap;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Referee createReferee() {
-		final RefereeImpl referee = new RefereeImpl();
+		RefereeImpl referee = new RefereeImpl();
 		return referee;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Map.Entry<Referee, Game> createRefereeToGamesMap() {
-		final RefereeToGamesMapImpl refereeToGamesMap = new RefereeToGamesMapImpl();
+		RefereeToGamesMapImpl refereeToGamesMap = new RefereeToGamesMapImpl();
 		return refereeToGamesMap;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Area createArea() {
-		final AreaImpl area = new AreaImpl();
+		AreaImpl area = new AreaImpl();
 		return area;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Fan createFan() {
-		final FanImpl fan = new FanImpl();
+		FanImpl fan = new FanImpl();
 		return fan;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Merchandise createMerchandise() {
-		final MerchandiseImpl merchandise = new MerchandiseImpl();
+		MerchandiseImpl merchandise = new MerchandiseImpl();
 		return merchandise;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TournamentType createTournamentTypeFromString(EDataType eDataType, String initialValue) {
-		final TournamentType result = TournamentType.get(initialValue);
+		TournamentType result = TournamentType.get(initialValue);
 		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;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String convertTournamentTypeToString(EDataType eDataType, Object instanceValue) {
@@ -301,23 +299,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Gender createGenderFromString(EDataType eDataType, String initialValue) {
-		final Gender result = Gender.get(initialValue);
+		Gender result = Gender.get(initialValue);
 		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;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String convertGenderToString(EDataType eDataType, Object instanceValue) {
@@ -327,7 +323,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public XMLGregorianCalendar createXMLDateFromString(EDataType eDataType, String initialValue) {
@@ -338,7 +334,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String convertXMLDateToString(EDataType eDataType, Object instanceValue) {
@@ -348,7 +344,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingPackage getBowlingPackage() {
@@ -358,7 +354,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java
index f5752db..123c854 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/BowlingPackageImpl.java
@@ -43,14 +43,14 @@
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class BowlingPackageImpl extends EPackageImpl implements BowlingPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass playerEClass = null;
@@ -58,7 +58,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass leagueEClass = null;
@@ -66,7 +66,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass tournamentEClass = null;
@@ -74,7 +74,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass matchupEClass = null;
@@ -82,7 +82,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass gameEClass = null;
@@ -90,7 +90,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass playerToPointsMapEClass = null;
@@ -98,7 +98,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass refereeEClass = null;
@@ -106,7 +106,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass refereeToGamesMapEClass = null;
@@ -114,7 +114,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass areaEClass = null;
@@ -122,7 +122,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass fanEClass = null;
@@ -130,7 +130,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass merchandiseEClass = null;
@@ -138,7 +138,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EEnum tournamentTypeEEnum = null;
@@ -146,7 +146,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EEnum genderEEnum = null;
@@ -154,7 +154,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EDataType xmlDateEDataType = null;
@@ -180,33 +180,33 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
+	 * 
 	 * <p>
-	 * This method is used to initialize {@link BowlingPackage#eINSTANCE} when that field is accessed. Clients should
-	 * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+	 * This method is used to initialize {@link BowlingPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static BowlingPackage init() {
-		if (isInited) {
+		if (isInited)
 			return (BowlingPackage) EPackage.Registry.INSTANCE.getEPackage(BowlingPackage.eNS_URI);
-		}
 
 		// Obtain or create and register package
-		final BowlingPackageImpl theBowlingPackage = (BowlingPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof BowlingPackageImpl ? EPackage.Registry.INSTANCE
-			.get(eNS_URI)
-			: new BowlingPackageImpl());
+		BowlingPackageImpl theBowlingPackage = (BowlingPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof BowlingPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new BowlingPackageImpl());
 
 		isInited = true;
 
@@ -217,13 +217,12 @@
 		theBowlingPackage.initializePackageContents();
 
 		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theBowlingPackage,
-				new EValidator.Descriptor() {
-					public EValidator getEValidator() {
-						return BowlingValidator.INSTANCE;
-					}
-				});
+		EValidator.Registry.INSTANCE.put(theBowlingPackage,
+			new EValidator.Descriptor() {
+				public EValidator getEValidator() {
+					return BowlingValidator.INSTANCE;
+				}
+			});
 
 		// Mark meta-data to indicate it can't be changed
 		theBowlingPackage.freeze();
@@ -236,7 +235,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getPlayer() {
@@ -246,7 +245,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_Name() {
@@ -256,7 +255,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_DateOfBirth() {
@@ -266,7 +265,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_Height() {
@@ -276,7 +275,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_IsProfessional() {
@@ -286,7 +285,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_EMails() {
@@ -296,7 +295,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_NumberOfVictories() {
@@ -306,7 +305,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_PlayedTournamentTypes() {
@@ -316,7 +315,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_WinLossRatio() {
@@ -326,7 +325,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayer_Gender() {
@@ -336,7 +335,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getLeague() {
@@ -346,7 +345,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getLeague_Name() {
@@ -356,7 +355,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getLeague_Players() {
@@ -366,7 +365,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getTournament() {
@@ -376,7 +375,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTournament_Matchups() {
@@ -386,7 +385,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTournament_Type() {
@@ -396,7 +395,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTournament_PlayerPoints() {
@@ -406,7 +405,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTournament_Players() {
@@ -416,7 +415,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTournament_Referees() {
@@ -426,7 +425,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTournament_PriceMoney() {
@@ -436,7 +435,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTournament_ReceivesTrophy() {
@@ -446,7 +445,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTournament_MatchDays() {
@@ -456,7 +455,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getMatchup() {
@@ -466,7 +465,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getMatchup_Games() {
@@ -476,7 +475,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatchup_NrSpectators() {
@@ -486,7 +485,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getGame() {
@@ -496,7 +495,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getGame_Matchup() {
@@ -506,7 +505,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getGame_Player() {
@@ -516,7 +515,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGame_Frames() {
@@ -526,7 +525,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getPlayerToPointsMap() {
@@ -536,7 +535,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getPlayerToPointsMap_Key() {
@@ -546,7 +545,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPlayerToPointsMap_Value() {
@@ -556,7 +555,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getReferee() {
@@ -566,7 +565,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getReferee_DateOfBirth() {
@@ -576,7 +575,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getReferee_League() {
@@ -586,7 +585,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getRefereeToGamesMap() {
@@ -596,7 +595,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getRefereeToGamesMap_Key() {
@@ -606,7 +605,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getRefereeToGamesMap_Value() {
@@ -616,7 +615,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getArea() {
@@ -626,7 +625,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getArea_Areas() {
@@ -636,7 +635,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getArea_Tournaments() {
@@ -646,7 +645,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getFan() {
@@ -656,7 +655,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_Name() {
@@ -666,7 +665,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_DateOfBirth() {
@@ -676,7 +675,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_HasSeasonTicket() {
@@ -686,7 +685,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_EMails() {
@@ -696,7 +695,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_Gender() {
@@ -706,7 +705,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getFan_FavouritePlayer() {
@@ -716,7 +715,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getFan_VisitedTournaments() {
@@ -726,7 +725,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_NumberOfTournamentsVisited() {
@@ -736,7 +735,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getFan_MoneySpentOnTickets() {
@@ -746,7 +745,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getFan_FanMerchandise() {
@@ -756,7 +755,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getFan_FavouriteMerchandise() {
@@ -766,7 +765,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getMerchandise() {
@@ -776,7 +775,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMerchandise_Name() {
@@ -786,7 +785,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMerchandise_Price() {
@@ -796,7 +795,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMerchandise_SerialNumber() {
@@ -806,7 +805,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EEnum getTournamentType() {
@@ -816,7 +815,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EEnum getGender() {
@@ -826,7 +825,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EDataType getXMLDate() {
@@ -836,7 +835,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingFactory getBowlingFactory() {
@@ -846,7 +845,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -856,13 +855,12 @@
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -945,7 +943,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -955,13 +953,12 @@
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -977,47 +974,33 @@
 
 		// Initialize classes and features; add operations and parameters
 		initEClass(playerEClass, Player.class, "Player", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_Name(),
-			ecorePackage.getEString(),
-			"name", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_DateOfBirth(),
-			ecorePackage.getEDate(),
-			"dateOfBirth", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_Height(),
-			ecorePackage.getEDouble(),
-			"height", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_IsProfessional(),
-			ecorePackage.getEBoolean(),
-			"isProfessional", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_EMails(),
-			ecorePackage.getEString(),
-			"eMails", null, 1, -1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_NumberOfVictories(),
-			ecorePackage.getEInt(),
-			"numberOfVictories", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_PlayedTournamentTypes(),
-			getTournamentType(),
-			"playedTournamentTypes", null, 0, -1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_WinLossRatio(),
-			ecorePackage.getEBigDecimal(),
-			"winLossRatio", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayer_Gender(),
-			getGender(),
-			"gender", null, 0, 1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getPlayer_Name(), ecorePackage.getEString(), "name", null, 0, 1, Player.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPlayer_DateOfBirth(), ecorePackage.getEDate(), "dateOfBirth", null, 0, 1, Player.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPlayer_Height(), ecorePackage.getEDouble(), "height", null, 0, 1, Player.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPlayer_IsProfessional(), ecorePackage.getEBoolean(), "isProfessional", null, 0, 1, //$NON-NLS-1$
+			Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEAttribute(getPlayer_EMails(), ecorePackage.getEString(), "eMails", null, 1, -1, Player.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPlayer_NumberOfVictories(), ecorePackage.getEInt(), "numberOfVictories", null, 0, 1, //$NON-NLS-1$
+			Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEAttribute(getPlayer_PlayedTournamentTypes(), this.getTournamentType(), "playedTournamentTypes", null, 0, //$NON-NLS-1$
+			-1, Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPlayer_WinLossRatio(), ecorePackage.getEBigDecimal(), "winLossRatio", null, 0, 1, //$NON-NLS-1$
+			Player.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEAttribute(getPlayer_Gender(), this.getGender(), "gender", null, 0, 1, Player.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		final EOperation op = addEOperation(playerEClass, ecorePackage.getEBoolean(),
-			"validate", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
+		EOperation op = addEOperation(playerEClass, ecorePackage.getEBoolean(), "validate", 0, 1, IS_UNIQUE, //$NON-NLS-1$
+			IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "chain", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
-		final EGenericType g1 = createEGenericType(ecorePackage.getEMap());
+		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
 		EGenericType g2 = createEGenericType();
 		g1.getETypeArguments().add(g2);
 		g2 = createEGenericType();
@@ -1025,194 +1008,127 @@
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(leagueEClass, League.class, "League", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getLeague_Name(),
-			ecorePackage.getEString(),
-			"name", null, 0, 1, League.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getLeague_Players(),
-			getPlayer(),
-			null,
-			"players", null, 0, -1, League.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getLeague_Name(), ecorePackage.getEString(), "name", null, 0, 1, League.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getLeague_Players(), this.getPlayer(), null, "players", null, 0, -1, League.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
 
-		initEClass(tournamentEClass, Tournament.class,
-			"Tournament", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getTournament_Matchups(),
-			getMatchup(),
-			null,
-			"matchups", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTournament_Type(),
-			getTournamentType(),
-			"type", null, 0, 1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTournament_PlayerPoints(),
-			getPlayerToPointsMap(),
-			null,
-			"playerPoints", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTournament_Players(),
-			getPlayer(),
-			null,
-			"players", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTournament_Referees(),
-			getRefereeToGamesMap(),
-			null,
-			"referees", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTournament_PriceMoney(),
-			ecorePackage.getEDouble(),
-			"priceMoney", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTournament_ReceivesTrophy(),
-			ecorePackage.getEBoolean(),
-			"receivesTrophy", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTournament_MatchDays(),
-			ecorePackage.getEDate(),
-			"matchDays", null, 0, -1, Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(tournamentEClass, Tournament.class, "Tournament", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTournament_Matchups(), this.getMatchup(), null, "matchups", null, 0, -1, Tournament.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTournament_Type(), this.getTournamentType(), "type", null, 0, 1, Tournament.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTournament_PlayerPoints(), this.getPlayerToPointsMap(), null, "playerPoints", null, 0, -1, //$NON-NLS-1$
+			Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTournament_Players(), this.getPlayer(), null, "players", null, 0, -1, Tournament.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getTournament_Referees(), this.getRefereeToGamesMap(), null, "referees", null, 0, -1, //$NON-NLS-1$
+			Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTournament_PriceMoney(), ecorePackage.getEDouble(), "priceMoney", null, 0, -1, //$NON-NLS-1$
+			Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTournament_ReceivesTrophy(), ecorePackage.getEBoolean(), "receivesTrophy", null, 0, -1, //$NON-NLS-1$
+			Tournament.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTournament_MatchDays(), ecorePackage.getEDate(), "matchDays", null, 0, -1, Tournament.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(matchupEClass, Matchup.class, "Matchup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getMatchup_Games(),
-			getGame(),
-			getGame_Matchup(),
-			"games", null, 2, 2, Matchup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getMatchup_NrSpectators(),
-			ecorePackage.getEBigInteger(),
-			"nrSpectators", null, 0, 1, Matchup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getMatchup_Games(), this.getGame(), this.getGame_Matchup(), "games", null, 2, 2, Matchup.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMatchup_NrSpectators(), ecorePackage.getEBigInteger(), "nrSpectators", null, 0, 1, //$NON-NLS-1$
+			Matchup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
 
 		initEClass(gameEClass, Game.class, "Game", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getGame_Matchup(),
-			getMatchup(),
-			getMatchup_Games(),
-			"matchup", null, 1, 1, Game.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getGame_Player(),
-			getPlayer(),
-			null,
-			"player", null, 0, 1, Game.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getGame_Frames(),
-			ecorePackage.getEInt(),
-			"frames", null, 0, 10, Game.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getGame_Matchup(), this.getMatchup(), this.getMatchup_Games(), "matchup", null, 1, 1, Game.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getGame_Player(), this.getPlayer(), null, "player", null, 0, 1, Game.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEAttribute(getGame_Frames(), ecorePackage.getEInt(), "frames", null, 0, 10, Game.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-		initEClass(playerToPointsMapEClass, Map.Entry.class,
-			"PlayerToPointsMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getPlayerToPointsMap_Key(),
-			getPlayer(),
-			null,
-			"key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getPlayerToPointsMap_Value(),
-			ecorePackage.getEIntegerObject(),
-			"value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(playerToPointsMapEClass, Map.Entry.class, "PlayerToPointsMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getPlayerToPointsMap_Key(), this.getPlayer(), null, "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getPlayerToPointsMap_Value(), ecorePackage.getEIntegerObject(), "value", null, 0, 1, //$NON-NLS-1$
+			Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
 
 		initEClass(refereeEClass, Referee.class, "Referee", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getReferee_DateOfBirth(),
-			getXMLDate(),
-			"dateOfBirth", null, 0, 1, Referee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getReferee_League(),
-			getLeague(),
-			null,
-			"league", null, 0, 1, Referee.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getReferee_DateOfBirth(), this.getXMLDate(), "dateOfBirth", null, 0, 1, Referee.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getReferee_League(), this.getLeague(), null, "league", null, 0, 1, Referee.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
 
-		initEClass(refereeToGamesMapEClass, Map.Entry.class,
-			"RefereeToGamesMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getRefereeToGamesMap_Key(),
-			getReferee(),
-			null,
-			"key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getRefereeToGamesMap_Value(),
-			getGame(),
-			null,
-			"value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(refereeToGamesMapEClass, Map.Entry.class, "RefereeToGamesMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getRefereeToGamesMap_Key(), this.getReferee(), null, "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getRefereeToGamesMap_Value(), this.getGame(), null, "value", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		initEClass(areaEClass, Area.class, "Area", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getArea_Areas(),
-			getArea(),
-			null,
-			"areas", null, 0, -1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getArea_Tournaments(),
-			getTournament(),
-			null,
-			"tournaments", null, 0, -1, Area.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getArea_Areas(), this.getArea(), null, "areas", null, 0, -1, Area.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getArea_Tournaments(), this.getTournament(), null, "tournaments", null, 0, -1, Area.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		initEClass(fanEClass, Fan.class, "Fan", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getFan_Name(),
-			ecorePackage.getEString(),
-			"name", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getFan_DateOfBirth(),
-			ecorePackage.getEDate(),
-			"dateOfBirth", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getFan_HasSeasonTicket(),
-			ecorePackage.getEBoolean(),
-			"hasSeasonTicket", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getFan_EMails(),
-			ecorePackage.getEString(),
-			"eMails", null, 0, -1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getFan_Gender(),
-			getGender(),
-			"gender", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getFan_FavouritePlayer(),
-			getPlayer(),
-			null,
-			"favouritePlayer", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getFan_FanMerchandise(),
-			getMerchandise(),
-			null,
-			"fanMerchandise", null, 0, -1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getFan_FavouriteMerchandise(),
-			getMerchandise(),
-			null,
-			"favouriteMerchandise", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getFan_VisitedTournaments(),
-			getTournament(),
-			null,
-			"visitedTournaments", null, 0, -1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getFan_NumberOfTournamentsVisited(),
-			ecorePackage.getEInt(),
-			"numberOfTournamentsVisited", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getFan_MoneySpentOnTickets(),
-			ecorePackage.getEDouble(),
-			"moneySpentOnTickets", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getFan_Name(), ecorePackage.getEString(), "name", null, 0, 1, Fan.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFan_DateOfBirth(), ecorePackage.getEDate(), "dateOfBirth", null, 0, 1, Fan.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFan_HasSeasonTicket(), ecorePackage.getEBoolean(), "hasSeasonTicket", null, 0, 1, Fan.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFan_EMails(), ecorePackage.getEString(), "eMails", null, 0, -1, Fan.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFan_Gender(), this.getGender(), "gender", null, 0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFan_FavouritePlayer(), this.getPlayer(), null, "favouritePlayer", null, 0, 1, Fan.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getFan_FanMerchandise(), this.getMerchandise(), null, "fanMerchandise", null, 0, -1, Fan.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getFan_FavouriteMerchandise(), this.getMerchandise(), null, "favouriteMerchandise", null, 0, 1, //$NON-NLS-1$
+			Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getFan_VisitedTournaments(), this.getTournament(), null, "visitedTournaments", null, 0, -1, //$NON-NLS-1$
+			Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getFan_NumberOfTournamentsVisited(), ecorePackage.getEInt(), "numberOfTournamentsVisited", null, //$NON-NLS-1$
+			0, 1, Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEAttribute(getFan_MoneySpentOnTickets(), ecorePackage.getEDouble(), "moneySpentOnTickets", null, 0, 1, //$NON-NLS-1$
+			Fan.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
 
-		initEClass(merchandiseEClass, Merchandise.class,
-			"Merchandise", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getMerchandise_Name(),
-			ecorePackage.getEString(),
-			"name", null, 0, 1, Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getMerchandise_Price(),
-			ecorePackage.getEBigDecimal(),
-			"price", null, 0, 1, Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getMerchandise_SerialNumber(),
-			ecorePackage.getEBigInteger(),
-			"serialNumber", null, 0, 1, Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(merchandiseEClass, Merchandise.class, "Merchandise", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getMerchandise_Name(), ecorePackage.getEString(), "name", null, 0, 1, Merchandise.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMerchandise_Price(), ecorePackage.getEBigDecimal(), "price", null, 0, 1, Merchandise.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMerchandise_SerialNumber(), ecorePackage.getEBigInteger(), "serialNumber", null, 0, 1, //$NON-NLS-1$
+			Merchandise.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		// Initialize enums and add enum literals
 		initEEnum(tournamentTypeEEnum, TournamentType.class, "TournamentType"); //$NON-NLS-1$
@@ -1224,8 +1140,8 @@
 		addEEnumLiteral(genderEEnum, Gender.MALE);
 
 		// Initialize data types
-		initEDataType(xmlDateEDataType, XMLGregorianCalendar.class,
-			"XMLDate", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEDataType(xmlDateEDataType, XMLGregorianCalendar.class, "XMLDate", IS_SERIALIZABLE, //$NON-NLS-1$
+			!IS_GENERATED_INSTANCE_CLASS);
 
 		// Create resource
 		createResource(eNS_URI);
@@ -1239,15 +1155,15 @@
 	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
-	 * @since 1.5
 	 */
 	protected void createExtendedMetaDataAnnotations() {
-		final String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
 		addAnnotation(xmlDateEDataType,
 			source,
-			new String[] { "baseType", "http://www.eclipse.org/emf/2003/XMLType#date" //$NON-NLS-1$ //$NON-NLS-2$
+			new String[] {
+				"baseType", "http://www.eclipse.org/emf/2003/XMLType#date" //$NON-NLS-1$ //$NON-NLS-2$
 			});
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java
index 67e41e0..eec3a5f 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/FanImpl.java
@@ -37,6 +37,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -47,11 +48,10 @@
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getFanMerchandise <em>Fan Merchandise</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getFavouriteMerchandise <em>Favourite Merchandise</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getVisitedTournaments <em>Visited Tournaments</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getNumberOfTournamentsVisited <em>Number Of Tournaments
- * Visited</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getNumberOfTournamentsVisited
+ * <em>Number Of Tournaments Visited</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.FanImpl#getMoneySpentOnTickets <em>Money Spent On Tickets</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -60,7 +60,7 @@
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -71,7 +71,7 @@
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -82,7 +82,7 @@
 	 * This is true if the Name attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -92,7 +92,7 @@
 	 * The default value of the '{@link #getDateOfBirth() <em>Date Of Birth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDateOfBirth()
 	 * @generated
 	 * @ordered
@@ -103,7 +103,7 @@
 	 * The cached value of the '{@link #getDateOfBirth() <em>Date Of Birth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDateOfBirth()
 	 * @generated
 	 * @ordered
@@ -114,7 +114,7 @@
 	 * This is true if the Date Of Birth attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -124,7 +124,7 @@
 	 * The default value of the '{@link #isHasSeasonTicket() <em>Has Season Ticket</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isHasSeasonTicket()
 	 * @generated
 	 * @ordered
@@ -135,7 +135,7 @@
 	 * The cached value of the '{@link #isHasSeasonTicket() <em>Has Season Ticket</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isHasSeasonTicket()
 	 * @generated
 	 * @ordered
@@ -146,7 +146,7 @@
 	 * This is true if the Has Season Ticket attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -156,7 +156,7 @@
 	 * The cached value of the '{@link #getEMails() <em>EMails</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getEMails()
 	 * @generated
 	 * @ordered
@@ -167,7 +167,7 @@
 	 * The default value of the '{@link #getGender() <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getGender()
 	 * @generated
 	 * @ordered
@@ -178,7 +178,7 @@
 	 * The cached value of the '{@link #getGender() <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getGender()
 	 * @generated
 	 * @ordered
@@ -189,7 +189,7 @@
 	 * This is true if the Gender attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -199,7 +199,7 @@
 	 * The cached value of the '{@link #getFavouritePlayer() <em>Favourite Player</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFavouritePlayer()
 	 * @generated
 	 * @ordered
@@ -210,7 +210,7 @@
 	 * This is true if the Favourite Player reference has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -220,7 +220,7 @@
 	 * The cached value of the '{@link #getFanMerchandise() <em>Fan Merchandise</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFanMerchandise()
 	 * @generated
 	 * @ordered
@@ -232,7 +232,7 @@
 	 * reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFavouriteMerchandise()
 	 * @generated
 	 * @ordered
@@ -243,7 +243,7 @@
 	 * This is true if the Favourite Merchandise containment reference has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -253,7 +253,7 @@
 	 * The cached value of the '{@link #getVisitedTournaments() <em>Visited Tournaments</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getVisitedTournaments()
 	 * @generated
 	 * @ordered
@@ -265,7 +265,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNumberOfTournamentsVisited()
 	 * @generated
 	 * @ordered
@@ -277,7 +277,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNumberOfTournamentsVisited()
 	 * @generated
 	 * @ordered
@@ -288,7 +288,7 @@
 	 * This is true if the Number Of Tournaments Visited attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -298,7 +298,7 @@
 	 * The default value of the '{@link #getMoneySpentOnTickets() <em>Money Spent On Tickets</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMoneySpentOnTickets()
 	 * @generated
 	 * @ordered
@@ -309,7 +309,7 @@
 	 * The cached value of the '{@link #getMoneySpentOnTickets() <em>Money Spent On Tickets</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMoneySpentOnTickets()
 	 * @generated
 	 * @ordered
@@ -320,7 +320,7 @@
 	 * This is true if the Money Spent On Tickets attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -329,7 +329,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected FanImpl() {
@@ -339,7 +339,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -350,7 +350,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -360,40 +360,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
-		final String oldName = name;
+		String oldName = name;
 		name = newName;
-		final boolean oldNameESet = nameESet;
+		boolean oldNameESet = nameESet;
 		nameESet = true;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__NAME, oldName, name, !oldNameESet));
-		}
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__NAME, oldName, name, !oldNameESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetName() {
-		final String oldName = name;
-		final boolean oldNameESet = nameESet;
+		String oldName = name;
+		boolean oldNameESet = nameESet;
 		name = NAME_EDEFAULT;
 		nameESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__NAME, oldName, NAME_EDEFAULT,
 				oldNameESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetName() {
@@ -403,7 +402,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Date getDateOfBirth() {
@@ -413,41 +412,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setDateOfBirth(Date newDateOfBirth) {
-		final Date oldDateOfBirth = dateOfBirth;
+		Date oldDateOfBirth = dateOfBirth;
 		dateOfBirth = newDateOfBirth;
-		final boolean oldDateOfBirthESet = dateOfBirthESet;
+		boolean oldDateOfBirthESet = dateOfBirthESet;
 		dateOfBirthESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__DATE_OF_BIRTH, oldDateOfBirth,
 				dateOfBirth, !oldDateOfBirthESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetDateOfBirth() {
-		final Date oldDateOfBirth = dateOfBirth;
-		final boolean oldDateOfBirthESet = dateOfBirthESet;
+		Date oldDateOfBirth = dateOfBirth;
+		boolean oldDateOfBirthESet = dateOfBirthESet;
 		dateOfBirth = DATE_OF_BIRTH_EDEFAULT;
 		dateOfBirthESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__DATE_OF_BIRTH, oldDateOfBirth,
 				DATE_OF_BIRTH_EDEFAULT, oldDateOfBirthESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetDateOfBirth() {
@@ -457,7 +454,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isHasSeasonTicket() {
@@ -467,41 +464,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setHasSeasonTicket(boolean newHasSeasonTicket) {
-		final boolean oldHasSeasonTicket = hasSeasonTicket;
+		boolean oldHasSeasonTicket = hasSeasonTicket;
 		hasSeasonTicket = newHasSeasonTicket;
-		final boolean oldHasSeasonTicketESet = hasSeasonTicketESet;
+		boolean oldHasSeasonTicketESet = hasSeasonTicketESet;
 		hasSeasonTicketESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__HAS_SEASON_TICKET,
 				oldHasSeasonTicket, hasSeasonTicket, !oldHasSeasonTicketESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetHasSeasonTicket() {
-		final boolean oldHasSeasonTicket = hasSeasonTicket;
-		final boolean oldHasSeasonTicketESet = hasSeasonTicketESet;
+		boolean oldHasSeasonTicket = hasSeasonTicket;
+		boolean oldHasSeasonTicketESet = hasSeasonTicketESet;
 		hasSeasonTicket = HAS_SEASON_TICKET_EDEFAULT;
 		hasSeasonTicketESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__HAS_SEASON_TICKET,
 				oldHasSeasonTicket, HAS_SEASON_TICKET_EDEFAULT, oldHasSeasonTicketESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetHasSeasonTicket() {
@@ -511,7 +506,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<String> getEMails() {
@@ -524,19 +519,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetEMails() {
-		if (eMails != null) {
+		if (eMails != null)
 			((InternalEList.Unsettable<?>) eMails).unset();
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetEMails() {
@@ -546,7 +540,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Gender getGender() {
@@ -556,41 +550,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setGender(Gender newGender) {
-		final Gender oldGender = gender;
+		Gender oldGender = gender;
 		gender = newGender == null ? GENDER_EDEFAULT : newGender;
-		final boolean oldGenderESet = genderESet;
+		boolean oldGenderESet = genderESet;
 		genderESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__GENDER, oldGender, gender,
 				!oldGenderESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetGender() {
-		final Gender oldGender = gender;
-		final boolean oldGenderESet = genderESet;
+		Gender oldGender = gender;
+		boolean oldGenderESet = genderESet;
 		gender = GENDER_EDEFAULT;
 		genderESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__GENDER, oldGender,
 				GENDER_EDEFAULT, oldGenderESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetGender() {
@@ -600,18 +592,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player getFavouritePlayer() {
 		if (favouritePlayer != null && favouritePlayer.eIsProxy()) {
-			final InternalEObject oldFavouritePlayer = (InternalEObject) favouritePlayer;
+			InternalEObject oldFavouritePlayer = (InternalEObject) favouritePlayer;
 			favouritePlayer = (Player) eResolveProxy(oldFavouritePlayer);
 			if (favouritePlayer != oldFavouritePlayer) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.FAN__FAVOURITE_PLAYER,
 						oldFavouritePlayer, favouritePlayer));
-				}
 			}
 		}
 		return favouritePlayer;
@@ -620,7 +611,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player basicGetFavouritePlayer() {
@@ -630,41 +621,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setFavouritePlayer(Player newFavouritePlayer) {
-		final Player oldFavouritePlayer = favouritePlayer;
+		Player oldFavouritePlayer = favouritePlayer;
 		favouritePlayer = newFavouritePlayer;
-		final boolean oldFavouritePlayerESet = favouritePlayerESet;
+		boolean oldFavouritePlayerESet = favouritePlayerESet;
 		favouritePlayerESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__FAVOURITE_PLAYER,
 				oldFavouritePlayer, favouritePlayer, !oldFavouritePlayerESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetFavouritePlayer() {
-		final Player oldFavouritePlayer = favouritePlayer;
-		final boolean oldFavouritePlayerESet = favouritePlayerESet;
+		Player oldFavouritePlayer = favouritePlayer;
+		boolean oldFavouritePlayerESet = favouritePlayerESet;
 		favouritePlayer = null;
 		favouritePlayerESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__FAVOURITE_PLAYER,
 				oldFavouritePlayer, null, oldFavouritePlayerESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFavouritePlayer() {
@@ -674,7 +663,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Tournament> getVisitedTournaments() {
@@ -688,19 +677,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetVisitedTournaments() {
-		if (visitedTournaments != null) {
+		if (visitedTournaments != null)
 			((InternalEList.Unsettable<?>) visitedTournaments).unset();
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetVisitedTournaments() {
@@ -710,7 +698,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getNumberOfTournamentsVisited() {
@@ -720,42 +708,40 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setNumberOfTournamentsVisited(int newNumberOfTournamentsVisited) {
-		final int oldNumberOfTournamentsVisited = numberOfTournamentsVisited;
+		int oldNumberOfTournamentsVisited = numberOfTournamentsVisited;
 		numberOfTournamentsVisited = newNumberOfTournamentsVisited;
-		final boolean oldNumberOfTournamentsVisitedESet = numberOfTournamentsVisitedESet;
+		boolean oldNumberOfTournamentsVisitedESet = numberOfTournamentsVisitedESet;
 		numberOfTournamentsVisitedESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__NUMBER_OF_TOURNAMENTS_VISITED,
 				oldNumberOfTournamentsVisited, numberOfTournamentsVisited, !oldNumberOfTournamentsVisitedESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetNumberOfTournamentsVisited() {
-		final int oldNumberOfTournamentsVisited = numberOfTournamentsVisited;
-		final boolean oldNumberOfTournamentsVisitedESet = numberOfTournamentsVisitedESet;
+		int oldNumberOfTournamentsVisited = numberOfTournamentsVisited;
+		boolean oldNumberOfTournamentsVisitedESet = numberOfTournamentsVisitedESet;
 		numberOfTournamentsVisited = NUMBER_OF_TOURNAMENTS_VISITED_EDEFAULT;
 		numberOfTournamentsVisitedESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__NUMBER_OF_TOURNAMENTS_VISITED,
 				oldNumberOfTournamentsVisited, NUMBER_OF_TOURNAMENTS_VISITED_EDEFAULT,
 				oldNumberOfTournamentsVisitedESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetNumberOfTournamentsVisited() {
@@ -765,7 +751,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public double getMoneySpentOnTickets() {
@@ -775,41 +761,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setMoneySpentOnTickets(double newMoneySpentOnTickets) {
-		final double oldMoneySpentOnTickets = moneySpentOnTickets;
+		double oldMoneySpentOnTickets = moneySpentOnTickets;
 		moneySpentOnTickets = newMoneySpentOnTickets;
-		final boolean oldMoneySpentOnTicketsESet = moneySpentOnTicketsESet;
+		boolean oldMoneySpentOnTicketsESet = moneySpentOnTicketsESet;
 		moneySpentOnTicketsESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__MONEY_SPENT_ON_TICKETS,
 				oldMoneySpentOnTickets, moneySpentOnTickets, !oldMoneySpentOnTicketsESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetMoneySpentOnTickets() {
-		final double oldMoneySpentOnTickets = moneySpentOnTickets;
-		final boolean oldMoneySpentOnTicketsESet = moneySpentOnTicketsESet;
+		double oldMoneySpentOnTickets = moneySpentOnTickets;
+		boolean oldMoneySpentOnTicketsESet = moneySpentOnTicketsESet;
 		moneySpentOnTickets = MONEY_SPENT_ON_TICKETS_EDEFAULT;
 		moneySpentOnTicketsESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__MONEY_SPENT_ON_TICKETS,
 				oldMoneySpentOnTickets, MONEY_SPENT_ON_TICKETS_EDEFAULT, oldMoneySpentOnTicketsESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetMoneySpentOnTickets() {
@@ -819,7 +803,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Merchandise> getFanMerchandise() {
@@ -833,19 +817,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetFanMerchandise() {
-		if (fanMerchandise != null) {
+		if (fanMerchandise != null)
 			((InternalEList.Unsettable<?>) fanMerchandise).unset();
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFanMerchandise() {
@@ -855,28 +838,26 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Merchandise getFavouriteMerchandise() {
 		if (favouriteMerchandise != null && favouriteMerchandise.eIsProxy()) {
-			final InternalEObject oldFavouriteMerchandise = (InternalEObject) favouriteMerchandise;
+			InternalEObject oldFavouriteMerchandise = (InternalEObject) favouriteMerchandise;
 			favouriteMerchandise = (Merchandise) eResolveProxy(oldFavouriteMerchandise);
 			if (favouriteMerchandise != oldFavouriteMerchandise) {
-				final InternalEObject newFavouriteMerchandise = (InternalEObject) favouriteMerchandise;
-				NotificationChain msgs = oldFavouriteMerchandise.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, null);
+				InternalEObject newFavouriteMerchandise = (InternalEObject) favouriteMerchandise;
+				NotificationChain msgs = oldFavouriteMerchandise.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, null);
 				if (newFavouriteMerchandise.eInternalContainer() == null) {
-					msgs = newFavouriteMerchandise.eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-						- BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+					msgs = newFavouriteMerchandise.eInverseAdd(this,
+						EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
 				}
-				if (msgs != null) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						BowlingPackage.FAN__FAVOURITE_MERCHANDISE, oldFavouriteMerchandise, favouriteMerchandise));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.FAN__FAVOURITE_MERCHANDISE,
+						oldFavouriteMerchandise, favouriteMerchandise));
 			}
 		}
 		return favouriteMerchandise;
@@ -885,7 +866,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Merchandise basicGetFavouriteMerchandise() {
@@ -895,23 +876,22 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetFavouriteMerchandise(Merchandise newFavouriteMerchandise, NotificationChain msgs) {
-		final Merchandise oldFavouriteMerchandise = favouriteMerchandise;
+		Merchandise oldFavouriteMerchandise = favouriteMerchandise;
 		favouriteMerchandise = newFavouriteMerchandise;
-		final boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
+		boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
 		favouriteMerchandiseESet = true;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				BowlingPackage.FAN__FAVOURITE_MERCHANDISE, oldFavouriteMerchandise, newFavouriteMerchandise,
 				!oldFavouriteMerchandiseESet);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -919,54 +899,48 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setFavouriteMerchandise(Merchandise newFavouriteMerchandise) {
 		if (newFavouriteMerchandise != favouriteMerchandise) {
 			NotificationChain msgs = null;
-			if (favouriteMerchandise != null) {
-				msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
-			}
-			if (newFavouriteMerchandise != null) {
-				msgs = ((InternalEObject) newFavouriteMerchandise).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
-			}
+			if (favouriteMerchandise != null)
+				msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+			if (newFavouriteMerchandise != null)
+				msgs = ((InternalEObject) newFavouriteMerchandise).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
 			msgs = basicSetFavouriteMerchandise(newFavouriteMerchandise, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else {
-			final boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
+		} else {
+			boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
 			favouriteMerchandiseESet = true;
-			if (eNotificationRequired()) {
+			if (eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.FAN__FAVOURITE_MERCHANDISE,
 					newFavouriteMerchandise, newFavouriteMerchandise, !oldFavouriteMerchandiseESet));
-			}
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetFavouriteMerchandise(NotificationChain msgs) {
-		final Merchandise oldFavouriteMerchandise = favouriteMerchandise;
+		Merchandise oldFavouriteMerchandise = favouriteMerchandise;
 		favouriteMerchandise = null;
-		final boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
+		boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
 		favouriteMerchandiseESet = false;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET,
 				BowlingPackage.FAN__FAVOURITE_MERCHANDISE, oldFavouriteMerchandise, null, oldFavouriteMerchandiseESet);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -974,33 +948,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetFavouriteMerchandise() {
 		if (favouriteMerchandise != null) {
 			NotificationChain msgs = null;
-			msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-				- BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
+			msgs = ((InternalEObject) favouriteMerchandise).eInverseRemove(this,
+				EOPPOSITE_FEATURE_BASE - BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null, msgs);
 			msgs = basicUnsetFavouriteMerchandise(msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else {
-			final boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
+		} else {
+			boolean oldFavouriteMerchandiseESet = favouriteMerchandiseESet;
 			favouriteMerchandiseESet = false;
-			if (eNotificationRequired()) {
-				eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__FAVOURITE_MERCHANDISE,
-					null, null, oldFavouriteMerchandiseESet));
-			}
+			if (eNotificationRequired())
+				eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.FAN__FAVOURITE_MERCHANDISE, null,
+					null, oldFavouriteMerchandiseESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFavouriteMerchandise() {
@@ -1010,7 +981,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1027,7 +998,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1044,16 +1015,14 @@
 		case BowlingPackage.FAN__GENDER:
 			return getGender();
 		case BowlingPackage.FAN__FAVOURITE_PLAYER:
-			if (resolve) {
+			if (resolve)
 				return getFavouritePlayer();
-			}
 			return basicGetFavouritePlayer();
 		case BowlingPackage.FAN__FAN_MERCHANDISE:
 			return getFanMerchandise();
 		case BowlingPackage.FAN__FAVOURITE_MERCHANDISE:
-			if (resolve) {
+			if (resolve)
 				return getFavouriteMerchandise();
-			}
 			return basicGetFavouriteMerchandise();
 		case BowlingPackage.FAN__VISITED_TOURNAMENTS:
 			return getVisitedTournaments();
@@ -1068,7 +1037,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -1118,7 +1087,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1164,7 +1133,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1199,60 +1168,47 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
-		if (nameESet) {
+		if (nameESet)
 			result.append(name);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(", dateOfBirth: "); //$NON-NLS-1$
-		if (dateOfBirthESet) {
+		if (dateOfBirthESet)
 			result.append(dateOfBirth);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(", hasSeasonTicket: "); //$NON-NLS-1$
-		if (hasSeasonTicketESet) {
+		if (hasSeasonTicketESet)
 			result.append(hasSeasonTicket);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(", eMails: "); //$NON-NLS-1$
 		result.append(eMails);
 		result.append(", gender: "); //$NON-NLS-1$
-		if (genderESet) {
+		if (genderESet)
 			result.append(gender);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(", numberOfTournamentsVisited: "); //$NON-NLS-1$
-		if (numberOfTournamentsVisitedESet) {
+		if (numberOfTournamentsVisitedESet)
 			result.append(numberOfTournamentsVisited);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(", moneySpentOnTickets: "); //$NON-NLS-1$
-		if (moneySpentOnTicketsESet) {
+		if (moneySpentOnTicketsESet)
 			result.append(moneySpentOnTickets);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(')');
 		return result.toString();
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java
index c611002..5914335 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/GameImpl.java
@@ -32,12 +32,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl#getMatchup <em>Matchup</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl#getPlayer <em>Player</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.GameImpl#getFrames <em>Frames</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -46,7 +46,7 @@
 	 * The cached value of the '{@link #getPlayer() <em>Player</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPlayer()
 	 * @generated
 	 * @ordered
@@ -57,7 +57,7 @@
 	 * The cached value of the '{@link #getFrames() <em>Frames</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFrames()
 	 * @generated
 	 * @ordered
@@ -67,7 +67,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected GameImpl() {
@@ -77,7 +77,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -88,33 +88,31 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Matchup getMatchup() {
-		if (eContainerFeatureID() != BowlingPackage.GAME__MATCHUP) {
+		if (eContainerFeatureID() != BowlingPackage.GAME__MATCHUP)
 			return null;
-		}
 		return (Matchup) eContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Matchup basicGetMatchup() {
-		if (eContainerFeatureID() != BowlingPackage.GAME__MATCHUP) {
+		if (eContainerFeatureID() != BowlingPackage.GAME__MATCHUP)
 			return null;
-		}
 		return (Matchup) eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetMatchup(Matchup newMatchup, NotificationChain msgs) {
@@ -125,49 +123,42 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setMatchup(Matchup newMatchup) {
 		if (newMatchup != eInternalContainer()
-			|| eContainerFeatureID() != BowlingPackage.GAME__MATCHUP && newMatchup != null) {
+			|| (eContainerFeatureID() != BowlingPackage.GAME__MATCHUP && newMatchup != null)) {
 			if (EcoreUtil.isAncestor(this, newMatchup))
-			{
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
-			}
 			NotificationChain msgs = null;
-			if (eInternalContainer() != null) {
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			}
-			if (newMatchup != null) {
+			if (newMatchup != null)
 				msgs = ((InternalEObject) newMatchup).eInverseAdd(this, BowlingPackage.MATCHUP__GAMES, Matchup.class,
 					msgs);
-			}
 			msgs = basicSetMatchup(newMatchup, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.GAME__MATCHUP, newMatchup, newMatchup));
-		}
+		} else if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, BowlingPackage.GAME__MATCHUP, newMatchup, newMatchup));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player getPlayer() {
 		if (player != null && player.eIsProxy()) {
-			final InternalEObject oldPlayer = (InternalEObject) player;
+			InternalEObject oldPlayer = (InternalEObject) player;
 			player = (Player) eResolveProxy(oldPlayer);
 			if (player != oldPlayer) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.GAME__PLAYER, oldPlayer,
 						player));
-				}
 			}
 		}
 		return player;
@@ -176,7 +167,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player basicGetPlayer() {
@@ -186,21 +177,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setPlayer(Player newPlayer) {
-		final Player oldPlayer = player;
+		Player oldPlayer = player;
 		player = newPlayer;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.GAME__PLAYER, oldPlayer, player));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Integer> getFrames() {
@@ -213,16 +203,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
 		switch (featureID) {
 		case BowlingPackage.GAME__MATCHUP:
-			if (eInternalContainer() != null) {
+			if (eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			}
 			return basicSetMatchup((Matchup) otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
@@ -231,7 +220,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -246,7 +235,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -261,21 +250,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		case BowlingPackage.GAME__MATCHUP:
-			if (resolve) {
+			if (resolve)
 				return getMatchup();
-			}
 			return basicGetMatchup();
 		case BowlingPackage.GAME__PLAYER:
-			if (resolve) {
+			if (resolve)
 				return getPlayer();
-			}
 			return basicGetPlayer();
 		case BowlingPackage.GAME__FRAMES:
 			return getFrames();
@@ -286,7 +273,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -310,7 +297,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -332,7 +319,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -351,16 +338,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (frames: "); //$NON-NLS-1$
 		result.append(frames);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java
index 42a8065..daa479c 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/LeagueImpl.java
@@ -31,11 +31,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.LeagueImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.LeagueImpl#getPlayers <em>Players</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -44,7 +44,7 @@
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -55,7 +55,7 @@
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -66,7 +66,7 @@
 	 * The cached value of the '{@link #getPlayers() <em>Players</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPlayers()
 	 * @generated
 	 * @ordered
@@ -76,7 +76,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected LeagueImpl() {
@@ -86,7 +86,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,7 +97,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -107,21 +107,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
-		final String oldName = name;
+		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.LEAGUE__NAME, oldName, name));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Player> getPlayers() {
@@ -134,7 +133,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,7 +148,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -166,7 +165,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -187,7 +186,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -206,7 +205,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -223,16 +222,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java
index e0ae909..44428ea 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MatchupImpl.java
@@ -32,11 +32,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.MatchupImpl#getGames <em>Games</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.MatchupImpl#getNrSpectators <em>Nr Spectators</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -45,7 +45,7 @@
 	 * The cached value of the '{@link #getGames() <em>Games</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getGames()
 	 * @generated
 	 * @ordered
@@ -56,7 +56,7 @@
 	 * The default value of the '{@link #getNrSpectators() <em>Nr Spectators</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNrSpectators()
 	 * @generated
 	 * @ordered
@@ -67,7 +67,7 @@
 	 * The cached value of the '{@link #getNrSpectators() <em>Nr Spectators</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNrSpectators()
 	 * @generated
 	 * @ordered
@@ -77,7 +77,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MatchupImpl() {
@@ -87,7 +87,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,7 +98,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Game> getGames() {
@@ -112,7 +112,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BigInteger getNrSpectators() {
@@ -122,22 +122,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setNrSpectators(BigInteger newNrSpectators) {
-		final BigInteger oldNrSpectators = nrSpectators;
+		BigInteger oldNrSpectators = nrSpectators;
 		nrSpectators = newNrSpectators;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.MATCHUP__NR_SPECTATORS,
 				oldNrSpectators, nrSpectators));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -153,7 +152,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -168,7 +167,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,7 +184,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -206,7 +205,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -225,7 +224,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -242,16 +241,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (nrSpectators: "); //$NON-NLS-1$
 		result.append(nrSpectators);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java
index 1306158..3cc3657 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/MerchandiseImpl.java
@@ -26,12 +26,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl#getPrice <em>Price</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.MerchandiseImpl#getSerialNumber <em>Serial Number</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -40,7 +40,7 @@
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -51,7 +51,7 @@
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -62,7 +62,7 @@
 	 * The default value of the '{@link #getPrice() <em>Price</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPrice()
 	 * @generated
 	 * @ordered
@@ -73,7 +73,7 @@
 	 * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPrice()
 	 * @generated
 	 * @ordered
@@ -84,7 +84,7 @@
 	 * This is true if the Price attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -94,7 +94,7 @@
 	 * The default value of the '{@link #getSerialNumber() <em>Serial Number</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getSerialNumber()
 	 * @generated
 	 * @ordered
@@ -105,7 +105,7 @@
 	 * The cached value of the '{@link #getSerialNumber() <em>Serial Number</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getSerialNumber()
 	 * @generated
 	 * @ordered
@@ -116,7 +116,7 @@
 	 * This is true if the Serial Number attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -125,7 +125,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MerchandiseImpl() {
@@ -135,7 +135,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -146,7 +146,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -156,21 +156,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
-		final String oldName = name;
+		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.MERCHANDISE__NAME, oldName, name));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BigDecimal getPrice() {
@@ -180,41 +179,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setPrice(BigDecimal newPrice) {
-		final BigDecimal oldPrice = price;
+		BigDecimal oldPrice = price;
 		price = newPrice;
-		final boolean oldPriceESet = priceESet;
+		boolean oldPriceESet = priceESet;
 		priceESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.MERCHANDISE__PRICE, oldPrice, price,
 				!oldPriceESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetPrice() {
-		final BigDecimal oldPrice = price;
-		final boolean oldPriceESet = priceESet;
+		BigDecimal oldPrice = price;
+		boolean oldPriceESet = priceESet;
 		price = PRICE_EDEFAULT;
 		priceESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.MERCHANDISE__PRICE, oldPrice,
 				PRICE_EDEFAULT, oldPriceESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetPrice() {
@@ -224,7 +221,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BigInteger getSerialNumber() {
@@ -234,41 +231,39 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSerialNumber(BigInteger newSerialNumber) {
-		final BigInteger oldSerialNumber = serialNumber;
+		BigInteger oldSerialNumber = serialNumber;
 		serialNumber = newSerialNumber;
-		final boolean oldSerialNumberESet = serialNumberESet;
+		boolean oldSerialNumberESet = serialNumberESet;
 		serialNumberESet = true;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.MERCHANDISE__SERIAL_NUMBER,
 				oldSerialNumber, serialNumber, !oldSerialNumberESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void unsetSerialNumber() {
-		final BigInteger oldSerialNumber = serialNumber;
-		final boolean oldSerialNumberESet = serialNumberESet;
+		BigInteger oldSerialNumber = serialNumber;
+		boolean oldSerialNumberESet = serialNumberESet;
 		serialNumber = SERIAL_NUMBER_EDEFAULT;
 		serialNumberESet = false;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, BowlingPackage.MERCHANDISE__SERIAL_NUMBER,
 				oldSerialNumber, SERIAL_NUMBER_EDEFAULT, oldSerialNumberESet));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSerialNumber() {
@@ -278,7 +273,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -297,7 +292,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -319,7 +314,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -341,7 +336,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -360,32 +355,27 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(", price: "); //$NON-NLS-1$
-		if (priceESet) {
+		if (priceESet)
 			result.append(price);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(", serialNumber: "); //$NON-NLS-1$
-		if (serialNumberESet) {
+		if (serialNumberESet)
 			result.append(serialNumber);
-		}
-		else {
+		else
 			result.append("<unset>"); //$NON-NLS-1$
-		}
 		result.append(')');
 		return result.toString();
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java
index 69ef7c8..d3ea433 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerImpl.java
@@ -36,6 +36,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getDateOfBirth <em>Date Of Birth</em>}</li>
@@ -43,12 +44,11 @@
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#isIsProfessional <em>Is Professional</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getEMails <em>EMails</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getNumberOfVictories <em>Number Of Victories</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getPlayedTournamentTypes <em>Played Tournament Types
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getPlayedTournamentTypes <em>Played Tournament Types</em>
+ * }</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getWinLossRatio <em>Win Loss Ratio</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerImpl#getGender <em>Gender</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -57,7 +57,7 @@
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -68,7 +68,7 @@
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -79,7 +79,7 @@
 	 * The default value of the '{@link #getDateOfBirth() <em>Date Of Birth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDateOfBirth()
 	 * @generated
 	 * @ordered
@@ -90,7 +90,7 @@
 	 * The cached value of the '{@link #getDateOfBirth() <em>Date Of Birth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDateOfBirth()
 	 * @generated
 	 * @ordered
@@ -101,7 +101,7 @@
 	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -112,7 +112,7 @@
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -123,7 +123,7 @@
 	 * The default value of the '{@link #isIsProfessional() <em>Is Professional</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isIsProfessional()
 	 * @generated
 	 * @ordered
@@ -134,7 +134,7 @@
 	 * The cached value of the '{@link #isIsProfessional() <em>Is Professional</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #isIsProfessional()
 	 * @generated
 	 * @ordered
@@ -145,7 +145,7 @@
 	 * The cached value of the '{@link #getEMails() <em>EMails</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getEMails()
 	 * @generated
 	 * @ordered
@@ -156,7 +156,7 @@
 	 * The default value of the '{@link #getNumberOfVictories() <em>Number Of Victories</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNumberOfVictories()
 	 * @generated
 	 * @ordered
@@ -167,7 +167,7 @@
 	 * The cached value of the '{@link #getNumberOfVictories() <em>Number Of Victories</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNumberOfVictories()
 	 * @generated
 	 * @ordered
@@ -178,7 +178,7 @@
 	 * The cached value of the '{@link #getPlayedTournamentTypes() <em>Played Tournament Types</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPlayedTournamentTypes()
 	 * @generated
 	 * @ordered
@@ -189,7 +189,7 @@
 	 * The default value of the '{@link #getWinLossRatio() <em>Win Loss Ratio</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getWinLossRatio()
 	 * @generated
 	 * @ordered
@@ -200,7 +200,7 @@
 	 * The cached value of the '{@link #getWinLossRatio() <em>Win Loss Ratio</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getWinLossRatio()
 	 * @generated
 	 * @ordered
@@ -211,7 +211,7 @@
 	 * The default value of the '{@link #getGender() <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getGender()
 	 * @generated
 	 * @ordered
@@ -222,7 +222,7 @@
 	 * The cached value of the '{@link #getGender() <em>Gender</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getGender()
 	 * @generated
 	 * @ordered
@@ -232,7 +232,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PlayerImpl() {
@@ -242,7 +242,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -253,7 +253,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -263,21 +263,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
-		final String oldName = name;
+		String oldName = name;
 		name = newName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__NAME, oldName, name));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Date getDateOfBirth() {
@@ -287,22 +286,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setDateOfBirth(Date newDateOfBirth) {
-		final Date oldDateOfBirth = dateOfBirth;
+		Date oldDateOfBirth = dateOfBirth;
 		dateOfBirth = newDateOfBirth;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__DATE_OF_BIRTH, oldDateOfBirth,
 				dateOfBirth));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public double getHeight() {
@@ -312,21 +310,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setHeight(double newHeight) {
-		final double oldHeight = height;
+		double oldHeight = height;
 		height = newHeight;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__HEIGHT, oldHeight, height));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean isIsProfessional() {
@@ -336,22 +333,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setIsProfessional(boolean newIsProfessional) {
-		final boolean oldIsProfessional = isProfessional;
+		boolean oldIsProfessional = isProfessional;
 		isProfessional = newIsProfessional;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__IS_PROFESSIONAL,
 				oldIsProfessional, isProfessional));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<String> getEMails() {
@@ -364,7 +360,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getNumberOfVictories() {
@@ -374,22 +370,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setNumberOfVictories(int newNumberOfVictories) {
-		final int oldNumberOfVictories = numberOfVictories;
+		int oldNumberOfVictories = numberOfVictories;
 		numberOfVictories = newNumberOfVictories;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__NUMBER_OF_VICTORIES,
 				oldNumberOfVictories, numberOfVictories));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<TournamentType> getPlayedTournamentTypes() {
@@ -403,7 +398,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BigDecimal getWinLossRatio() {
@@ -413,22 +408,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setWinLossRatio(BigDecimal newWinLossRatio) {
-		final BigDecimal oldWinLossRatio = winLossRatio;
+		BigDecimal oldWinLossRatio = winLossRatio;
 		winLossRatio = newWinLossRatio;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__WIN_LOSS_RATIO,
 				oldWinLossRatio, winLossRatio));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Gender getGender() {
@@ -438,15 +432,14 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setGender(Gender newGender) {
-		final Gender oldGender = gender;
+		Gender oldGender = gender;
 		gender = newGender == null ? GENDER_EDEFAULT : newGender;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER__GENDER, oldGender, gender));
-		}
 	}
 
 	/**
@@ -463,12 +456,10 @@
 	public boolean validate(DiagnosticChain chain, Map<?, ?> context) {
 		if (getHeight() > 10) {
 			if (chain != null) {
-				chain.add
-					(new BasicDiagnostic
-					(Diagnostic.ERROR,
-						BowlingValidator.DIAGNOSTIC_SOURCE,
-						BowlingValidator.PLAYER__VALIDATE, "Height seems too big.", //$NON-NLS-1$
-						new Object[] { this, BowlingPackage.eINSTANCE.getPlayer_Height() }));
+				chain.add(new BasicDiagnostic(Diagnostic.ERROR,
+					BowlingValidator.DIAGNOSTIC_SOURCE,
+					BowlingValidator.PLAYER__VALIDATE, "Height seems too big.", //$NON-NLS-1$
+					new Object[] { this, BowlingPackage.eINSTANCE.getPlayer_Height() }));
 			}
 			return false;
 		}
@@ -479,7 +470,7 @@
 	 * <!-- begin-user-doc -->
 	 * .
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -510,7 +501,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -553,7 +544,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -593,7 +584,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -614,8 +605,8 @@
 		case BowlingPackage.PLAYER__PLAYED_TOURNAMENT_TYPES:
 			return playedTournamentTypes != null && !playedTournamentTypes.isEmpty();
 		case BowlingPackage.PLAYER__WIN_LOSS_RATIO:
-			return WIN_LOSS_RATIO_EDEFAULT == null ? winLossRatio != null : !WIN_LOSS_RATIO_EDEFAULT
-				.equals(winLossRatio);
+			return WIN_LOSS_RATIO_EDEFAULT == null ? winLossRatio != null
+				: !WIN_LOSS_RATIO_EDEFAULT.equals(winLossRatio);
 		case BowlingPackage.PLAYER__GENDER:
 			return gender != GENDER_EDEFAULT;
 		}
@@ -625,16 +616,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: "); //$NON-NLS-1$
 		result.append(name);
 		result.append(", dateOfBirth: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java
index bb6357a..3bd6a46 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/PlayerToPointsMapImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerToPointsMapImpl#getTypedKey <em>Key</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.PlayerToPointsMapImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -40,7 +40,7 @@
 	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -51,7 +51,7 @@
 	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -62,7 +62,7 @@
 	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -72,7 +72,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected PlayerToPointsMapImpl() {
@@ -82,7 +82,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -93,18 +93,17 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player getTypedKey() {
 		if (key != null && key.eIsProxy()) {
-			final InternalEObject oldKey = (InternalEObject) key;
+			InternalEObject oldKey = (InternalEObject) key;
 			key = (Player) eResolveProxy(oldKey);
 			if (key != oldKey) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.PLAYER_TO_POINTS_MAP__KEY,
 						oldKey, key));
-				}
 			}
 		}
 		return key;
@@ -113,7 +112,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player basicGetTypedKey() {
@@ -123,21 +122,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedKey(Player newKey) {
-		final Player oldKey = key;
+		Player oldKey = key;
 		key = newKey;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER_TO_POINTS_MAP__KEY, oldKey, key));
-		}
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER_TO_POINTS_MAP__KEY, oldKey, key));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Integer getTypedValue() {
@@ -147,31 +146,29 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedValue(Integer newValue) {
-		final Integer oldValue = value;
+		Integer oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.PLAYER_TO_POINTS_MAP__VALUE, oldValue,
 				value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		case BowlingPackage.PLAYER_TO_POINTS_MAP__KEY:
-			if (resolve) {
+			if (resolve)
 				return getTypedKey();
-			}
 			return basicGetTypedKey();
 		case BowlingPackage.PLAYER_TO_POINTS_MAP__VALUE:
 			return getTypedValue();
@@ -182,7 +179,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -201,7 +198,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -220,7 +217,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -237,16 +234,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (value: "); //$NON-NLS-1$
 		result.append(value);
 		result.append(')');
@@ -256,7 +252,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected int hash = -1;
@@ -264,13 +260,13 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getHash() {
 		if (hash == -1) {
-			final Object theKey = getKey();
-			hash = theKey == null ? 0 : theKey.hashCode();
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
 		}
 		return hash;
 	}
@@ -278,7 +274,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setHash(int hash) {
@@ -288,7 +284,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Player getKey() {
@@ -298,7 +294,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setKey(Player key) {
@@ -308,7 +304,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Integer getValue() {
@@ -318,11 +314,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Integer setValue(Integer value) {
-		final Integer oldValue = getValue();
+		Integer oldValue = getValue();
 		setTypedValue(value);
 		return oldValue;
 	}
@@ -330,12 +326,12 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	public EMap<Player, Integer> getEMap() {
-		final EObject container = eContainer();
+		EObject container = eContainer();
 		return container == null ? null : (EMap<Player, Integer>) container.eGet(eContainmentFeature());
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java
index b4a4a5d..32a88db 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeImpl.java
@@ -27,11 +27,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeImpl#getDateOfBirth <em>Date Of Birth</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeImpl#getLeague <em>League</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -40,7 +40,7 @@
 	 * The default value of the '{@link #getDateOfBirth() <em>Date Of Birth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDateOfBirth()
 	 * @generated
 	 * @ordered
@@ -50,7 +50,7 @@
 	 * The cached value of the '{@link #getDateOfBirth() <em>Date Of Birth</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDateOfBirth()
 	 * @generated
 	 * @ordered
@@ -60,7 +60,7 @@
 	 * The cached value of the '{@link #getLeague() <em>League</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLeague()
 	 * @generated
 	 * @ordered
@@ -70,7 +70,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected RefereeImpl() {
@@ -80,7 +80,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -91,7 +91,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public XMLGregorianCalendar getDateOfBirth() {
@@ -101,33 +101,31 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setDateOfBirth(XMLGregorianCalendar newDateOfBirth) {
-		final XMLGregorianCalendar oldDateOfBirth = dateOfBirth;
+		XMLGregorianCalendar oldDateOfBirth = dateOfBirth;
 		dateOfBirth = newDateOfBirth;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE__DATE_OF_BIRTH,
-				oldDateOfBirth, dateOfBirth));
-		}
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE__DATE_OF_BIRTH, oldDateOfBirth,
+				dateOfBirth));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public League getLeague() {
 		if (league != null && league.eIsProxy()) {
-			final InternalEObject oldLeague = (InternalEObject) league;
+			InternalEObject oldLeague = (InternalEObject) league;
 			league = (League) eResolveProxy(oldLeague);
 			if (league != oldLeague) {
-				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.REFEREE__LEAGUE,
-						oldLeague, league));
-				}
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.REFEREE__LEAGUE, oldLeague,
+						league));
 			}
 		}
 		return league;
@@ -136,7 +134,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public League basicGetLeague() {
@@ -146,21 +144,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setLeague(League newLeague) {
-		final League oldLeague = league;
+		League oldLeague = league;
 		league = newLeague;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE__LEAGUE, oldLeague, league));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,9 +166,8 @@
 		case BowlingPackage.REFEREE__DATE_OF_BIRTH:
 			return getDateOfBirth();
 		case BowlingPackage.REFEREE__LEAGUE:
-			if (resolve) {
+			if (resolve)
 				return getLeague();
-			}
 			return basicGetLeague();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -180,7 +176,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -199,7 +195,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -218,7 +214,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -235,16 +231,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (dateOfBirth: "); //$NON-NLS-1$
 		result.append(dateOfBirth);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java
index c6202b7..717e738 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/RefereeToGamesMapImpl.java
@@ -29,11 +29,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeToGamesMapImpl#getTypedKey <em>Key</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.RefereeToGamesMapImpl#getTypedValue <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -42,7 +42,7 @@
 	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedKey()
 	 * @generated
 	 * @ordered
@@ -53,7 +53,7 @@
 	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTypedValue()
 	 * @generated
 	 * @ordered
@@ -63,7 +63,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected RefereeToGamesMapImpl() {
@@ -73,7 +73,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,28 +84,26 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Referee getTypedKey() {
 		if (key != null && key.eIsProxy()) {
-			final InternalEObject oldKey = (InternalEObject) key;
+			InternalEObject oldKey = (InternalEObject) key;
 			key = (Referee) eResolveProxy(oldKey);
 			if (key != oldKey) {
-				final InternalEObject newKey = (InternalEObject) key;
-				NotificationChain msgs = oldKey.eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, null);
+				InternalEObject newKey = (InternalEObject) key;
+				NotificationChain msgs = oldKey.eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, null);
 				if (newKey.eInternalContainer() == null) {
 					msgs = newKey.eInverseAdd(this, EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY,
 						null, msgs);
 				}
-				if (msgs != null) {
+				if (msgs != null)
 					msgs.dispatch();
-				}
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, BowlingPackage.REFEREE_TO_GAMES_MAP__KEY,
 						oldKey, key));
-				}
 			}
 		}
 		return key;
@@ -114,7 +112,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Referee basicGetTypedKey() {
@@ -124,20 +122,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTypedKey(Referee newKey, NotificationChain msgs) {
-		final Referee oldKey = key;
+		Referee oldKey = key;
 		key = newKey;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, oldKey, newKey);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -145,46 +142,40 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedKey(Referee newKey) {
 		if (newKey != key) {
 			NotificationChain msgs = null;
-			if (key != null) {
-				msgs = ((InternalEObject) key).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
-			}
-			if (newKey != null) {
-				msgs = ((InternalEObject) newKey).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
-			}
+			if (key != null)
+				msgs = ((InternalEObject) key).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
+			if (newKey != null)
+				msgs = ((InternalEObject) newKey).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, null, msgs);
 			msgs = basicSetTypedKey(newKey, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE_TO_GAMES_MAP__KEY, newKey,
 				newKey));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Game getTypedValue() {
 		if (value != null && value.eIsProxy()) {
-			final InternalEObject oldValue = (InternalEObject) value;
+			InternalEObject oldValue = (InternalEObject) value;
 			value = (Game) eResolveProxy(oldValue);
 			if (value != oldValue) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
 						BowlingPackage.REFEREE_TO_GAMES_MAP__VALUE, oldValue, value));
-				}
 			}
 		}
 		return value;
@@ -193,7 +184,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Game basicGetTypedValue() {
@@ -203,22 +194,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTypedValue(Game newValue) {
-		final Game oldValue = value;
+		Game oldValue = value;
 		value = newValue;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.REFEREE_TO_GAMES_MAP__VALUE, oldValue,
 				value));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -233,21 +223,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
 		switch (featureID) {
 		case BowlingPackage.REFEREE_TO_GAMES_MAP__KEY:
-			if (resolve) {
+			if (resolve)
 				return getTypedKey();
-			}
 			return basicGetTypedKey();
 		case BowlingPackage.REFEREE_TO_GAMES_MAP__VALUE:
-			if (resolve) {
+			if (resolve)
 				return getTypedValue();
-			}
 			return basicGetTypedValue();
 		}
 		return super.eGet(featureID, resolve, coreType);
@@ -256,7 +244,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -275,7 +263,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -294,7 +282,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -311,7 +299,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected int hash = -1;
@@ -319,13 +307,13 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getHash() {
 		if (hash == -1) {
-			final Object theKey = getKey();
-			hash = theKey == null ? 0 : theKey.hashCode();
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
 		}
 		return hash;
 	}
@@ -333,7 +321,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setHash(int hash) {
@@ -343,7 +331,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Referee getKey() {
@@ -353,7 +341,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setKey(Referee key) {
@@ -363,7 +351,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Game getValue() {
@@ -373,11 +361,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Game setValue(Game value) {
-		final Game oldValue = getValue();
+		Game oldValue = getValue();
 		setTypedValue(value);
 		return oldValue;
 	}
@@ -385,12 +373,12 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	public EMap<Referee, Game> getEMap() {
-		final EObject container = eContainer();
+		EObject container = eContainer();
 		return container == null ? null : (EMap<Referee, Game>) container.eGet(eContainmentFeature());
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java
index 00bae21..5aa6f52 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/impl/TournamentImpl.java
@@ -42,6 +42,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getMatchups <em>Matchups</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getType <em>Type</em>}</li>
@@ -52,7 +53,6 @@
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getReceivesTrophy <em>Receives Trophy</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.bowling.impl.TournamentImpl#getMatchDays <em>Match Days</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -61,7 +61,7 @@
 	 * The cached value of the '{@link #getMatchups() <em>Matchups</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMatchups()
 	 * @generated
 	 * @ordered
@@ -72,7 +72,7 @@
 	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -83,7 +83,7 @@
 	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getType()
 	 * @generated
 	 * @ordered
@@ -94,7 +94,7 @@
 	 * The cached value of the '{@link #getPlayerPoints() <em>Player Points</em>}' map.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPlayerPoints()
 	 * @generated
 	 * @ordered
@@ -105,7 +105,7 @@
 	 * The cached value of the '{@link #getPlayers() <em>Players</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPlayers()
 	 * @generated
 	 * @ordered
@@ -116,7 +116,7 @@
 	 * The cached value of the '{@link #getReferees() <em>Referees</em>}' map.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getReferees()
 	 * @generated
 	 * @ordered
@@ -127,7 +127,7 @@
 	 * The cached value of the '{@link #getPriceMoney() <em>Price Money</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getPriceMoney()
 	 * @generated
 	 * @ordered
@@ -138,7 +138,7 @@
 	 * The cached value of the '{@link #getReceivesTrophy() <em>Receives Trophy</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getReceivesTrophy()
 	 * @generated
 	 * @ordered
@@ -149,7 +149,7 @@
 	 * The cached value of the '{@link #getMatchDays() <em>Match Days</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getMatchDays()
 	 * @generated
 	 * @ordered
@@ -159,7 +159,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TournamentImpl() {
@@ -169,7 +169,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,7 +180,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Matchup> getMatchups() {
@@ -194,7 +194,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TournamentType getType() {
@@ -204,21 +204,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setType(TournamentType newType) {
-		final TournamentType oldType = type;
+		TournamentType oldType = type;
 		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, BowlingPackage.TOURNAMENT__TYPE, oldType, type));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMap<Player, Integer> getPlayerPoints() {
@@ -232,7 +231,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Player> getPlayers() {
@@ -245,7 +244,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EMap<Referee, Game> getReferees() {
@@ -259,7 +258,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Double> getPriceMoney() {
@@ -272,7 +271,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Boolean> getReceivesTrophy() {
@@ -286,7 +285,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<Date> getMatchDays() {
@@ -299,7 +298,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -318,7 +317,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -329,19 +328,17 @@
 		case BowlingPackage.TOURNAMENT__TYPE:
 			return getType();
 		case BowlingPackage.TOURNAMENT__PLAYER_POINTS:
-			if (coreType) {
+			if (coreType)
 				return getPlayerPoints();
-			} else {
+			else
 				return getPlayerPoints().map();
-			}
 		case BowlingPackage.TOURNAMENT__PLAYERS:
 			return getPlayers();
 		case BowlingPackage.TOURNAMENT__REFEREES:
-			if (coreType) {
+			if (coreType)
 				return getReferees();
-			} else {
+			else
 				return getReferees().map();
-			}
 		case BowlingPackage.TOURNAMENT__PRICE_MONEY:
 			return getPriceMoney();
 		case BowlingPackage.TOURNAMENT__RECEIVES_TROPHY:
@@ -355,7 +352,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -398,7 +395,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -435,7 +432,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -464,16 +461,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (type: "); //$NON-NLS-1$
 		result.append(type);
 		result.append(", priceMoney: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingAdapterFactory.java
index afc81cb..3298401 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingAdapterFactory.java
@@ -32,7 +32,7 @@
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage
  * @generated
  */
@@ -41,7 +41,7 @@
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static BowlingPackage modelPackage;
@@ -50,7 +50,7 @@
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingAdapterFactory() {
@@ -65,7 +65,7 @@
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance
 	 * object of the model.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -84,7 +84,7 @@
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected BowlingSwitch<Adapter> modelSwitch = new BowlingSwitch<Adapter>() {
@@ -153,7 +153,7 @@
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
@@ -169,7 +169,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Player
 	 * @generated
@@ -184,7 +184,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.League
 	 * @generated
@@ -200,7 +200,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Tournament
 	 * @generated
@@ -215,7 +215,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Matchup
 	 * @generated
@@ -230,7 +230,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Game
 	 * @generated
@@ -245,7 +245,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see java.util.Map.Entry
 	 * @generated
@@ -260,7 +260,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Referee
 	 * @generated
@@ -275,7 +275,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see java.util.Map.Entry
 	 * @generated
@@ -290,7 +290,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Area
 	 * @generated
@@ -305,7 +305,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Fan
 	 * @generated
@@ -321,7 +321,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.bowling.Merchandise
 	 * @generated
@@ -335,7 +335,7 @@
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java
index 94e1667..f93c5b6 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingSwitch.java
@@ -36,7 +36,7 @@
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage
  * @generated
  */
@@ -45,7 +45,7 @@
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static BowlingPackage modelPackage;
@@ -54,7 +54,7 @@
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingSwitch() {
@@ -68,7 +68,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -81,7 +81,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -89,10 +89,8 @@
 		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);
+		List<EClass> eSuperTypes = theEClass.getESuperTypes();
+		return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
 	}
 
 	/**
@@ -100,100 +98,89 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 		case BowlingPackage.PLAYER: {
-			final Player player = (Player) theEObject;
+			Player player = (Player) theEObject;
 			T result = casePlayer(player);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.LEAGUE: {
-			final League league = (League) theEObject;
+			League league = (League) theEObject;
 			T result = caseLeague(league);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.TOURNAMENT: {
-			final Tournament tournament = (Tournament) theEObject;
+			Tournament tournament = (Tournament) theEObject;
 			T result = caseTournament(tournament);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.MATCHUP: {
-			final Matchup matchup = (Matchup) theEObject;
+			Matchup matchup = (Matchup) theEObject;
 			T result = caseMatchup(matchup);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.GAME: {
-			final Game game = (Game) theEObject;
+			Game game = (Game) theEObject;
 			T result = caseGame(game);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.PLAYER_TO_POINTS_MAP: {
 			@SuppressWarnings("unchecked")
-			final Map.Entry<Player, Integer> playerToPointsMap = (Map.Entry<Player, Integer>) theEObject;
+			Map.Entry<Player, Integer> playerToPointsMap = (Map.Entry<Player, Integer>) theEObject;
 			T result = casePlayerToPointsMap(playerToPointsMap);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.REFEREE: {
-			final Referee referee = (Referee) theEObject;
+			Referee referee = (Referee) theEObject;
 			T result = caseReferee(referee);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.REFEREE_TO_GAMES_MAP: {
 			@SuppressWarnings("unchecked")
-			final Map.Entry<Referee, Game> refereeToGamesMap = (Map.Entry<Referee, Game>) theEObject;
+			Map.Entry<Referee, Game> refereeToGamesMap = (Map.Entry<Referee, Game>) theEObject;
 			T result = caseRefereeToGamesMap(refereeToGamesMap);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.AREA: {
-			final Area area = (Area) theEObject;
+			Area area = (Area) theEObject;
 			T result = caseArea(area);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.FAN: {
-			final Fan fan = (Fan) theEObject;
+			Fan fan = (Fan) theEObject;
 			T result = caseFan(fan);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case BowlingPackage.MERCHANDISE: {
-			final Merchandise merchandise = (Merchandise) theEObject;
+			Merchandise merchandise = (Merchandise) theEObject;
 			T result = caseMerchandise(merchandise);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		default:
@@ -207,7 +194,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Player</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -223,7 +210,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>League</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -239,7 +226,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Tournament</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -255,7 +242,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Matchup</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -271,7 +258,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Game</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -287,7 +274,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Player To Points Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -303,7 +290,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Referee</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -319,7 +306,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Referee To Games Map</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -335,7 +322,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Area</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -351,7 +338,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Fan</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -367,7 +354,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Merchandise</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -383,7 +370,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
diff --git a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java
index 0455d84..ed35447 100644
--- a/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java
+++ b/bundles/org.eclipse.emf.emfstore.examplemodel/src/org/eclipse/emf/emfstore/bowling/util/BowlingValidator.java
@@ -37,7 +37,7 @@
  * <!-- begin-user-doc -->
  * The <b>Validator</b> for the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.bowling.BowlingPackage
  * @generated
  */
@@ -46,7 +46,7 @@
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final BowlingValidator INSTANCE = new BowlingValidator();
@@ -56,7 +56,7 @@
 	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -67,7 +67,7 @@
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Validate' of 'Player'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final int PLAYER__VALIDATE = 1;
@@ -76,7 +76,7 @@
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 1;
@@ -86,7 +86,7 @@
 	 * derived class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
@@ -95,9 +95,8 @@
 	 * The cached base package validator.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
-	 * @since 1.5
 	 */
 	protected XMLTypeValidator xmlTypeValidator;
 
@@ -105,7 +104,7 @@
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public BowlingValidator() {
@@ -117,7 +116,7 @@
 	 * Returns the package of this validator switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,11 +128,12 @@
 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
 		switch (classifierID) {
 		case BowlingPackage.PLAYER:
 			return validatePlayer((Player) value, diagnostics, context);
@@ -171,35 +171,27 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validatePlayer(Player player, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(player, diagnostics, context)) {
+		if (!validate_NoCircularContainment(player, diagnostics, context))
 			return false;
-		}
 		boolean result = validate_EveryMultiplicityConforms(player, diagnostics, context);
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validate_EveryDataValueConforms(player, diagnostics, context);
-		}
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validate_EveryReferenceIsContained(player, diagnostics, context);
-		}
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validate_EveryProxyResolves(player, diagnostics, context);
-		}
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validate_UniqueID(player, diagnostics, context);
-		}
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validate_EveryKeyUnique(player, diagnostics, context);
-		}
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validate_EveryMapEntryUnique(player, diagnostics, context);
-		}
-		if (result || diagnostics != null) {
+		if (result || diagnostics != null)
 			result &= validatePlayer_validate(player, diagnostics, context);
-		}
 		return result;
 	}
 
@@ -207,7 +199,7 @@
 	 * Validates the validate constraint of '<em>Player</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validatePlayer_validate(Player player, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -217,7 +209,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateLeague(League league, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -227,7 +219,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateTournament(Tournament tournament, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -237,7 +229,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateMatchup(Matchup matchup, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -247,7 +239,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateGame(Game game, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -257,7 +249,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validatePlayerToPointsMap(Map.Entry<?, ?> playerToPointsMap, DiagnosticChain diagnostics,
@@ -268,7 +260,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateReferee(Referee referee, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -278,7 +270,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateRefereeToGamesMap(Map.Entry<?, ?> refereeToGamesMap, DiagnosticChain diagnostics,
@@ -289,7 +281,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateArea(Area area, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -299,7 +291,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateFan(Fan fan, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -309,17 +301,18 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public boolean validateMerchandise(Merchandise merchandise, DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateMerchandise(Merchandise merchandise, DiagnosticChain diagnostics,
+		Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(merchandise, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateTournamentType(TournamentType tournamentType, DiagnosticChain diagnostics,
@@ -330,7 +323,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateGender(Gender gender, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -340,7 +333,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public boolean validateXMLDate(XMLGregorianCalendar xmlDate, DiagnosticChain diagnostics,
@@ -352,7 +345,7 @@
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java
index e322c82..21aa607 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigEditPlugin.java
@@ -17,16 +17,15 @@
  * This is the central singleton for the Config edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public final class ConfigEditPlugin extends EMFPlugin
-{
+public final class ConfigEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final ConfigEditPlugin INSTANCE = new ConfigEditPlugin();
@@ -35,7 +34,7 @@
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -44,27 +43,24 @@
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public ConfigEditPlugin()
-	{
-		super(new ResourceLocator[]
-		{
-			});
+	public ConfigEditPlugin() {
+		super(new ResourceLocator[] {
+		});
 	}
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getPluginResourceLocator()
-	{
+	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
 
@@ -72,12 +68,11 @@
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	public static Implementation getPlugin()
-	{
+	public static Implementation getPlugin() {
 		return plugin;
 	}
 
@@ -85,20 +80,18 @@
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class Implementation extends EclipsePlugin
-	{
+	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
-		public Implementation()
-		{
+		public Implementation() {
 			super();
 
 			// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java
index e61b4e9..2d3cebb 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/ConfigItemProviderAdapterFactory.java
@@ -37,17 +37,16 @@
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ConfigItemProviderAdapterFactory extends ConfigAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable
-{
+	IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -56,7 +55,7 @@
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -65,7 +64,7 @@
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -74,11 +73,10 @@
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public ConfigItemProviderAdapterFactory()
-	{
+	public ConfigItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -91,7 +89,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestConfigItemProvider testConfigItemProvider;
@@ -100,14 +98,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestConfigAdapter()
-	{
-		if (testConfigItemProvider == null)
-		{
+	public Adapter createTestConfigAdapter() {
+		if (testConfigItemProvider == null) {
 			testConfigItemProvider = new TestConfigItemProvider(this);
 		}
 
@@ -119,7 +115,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestRunItemProvider testRunItemProvider;
@@ -128,14 +124,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestRunAdapter()
-	{
-		if (testRunItemProvider == null)
-		{
+	public Adapter createTestRunAdapter() {
+		if (testRunItemProvider == null) {
 			testRunItemProvider = new TestRunItemProvider(this);
 		}
 
@@ -147,7 +141,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestResultItemProvider testResultItemProvider;
@@ -156,14 +150,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestResultAdapter()
-	{
-		if (testResultItemProvider == null)
-		{
+	public Adapter createTestResultAdapter() {
+		if (testResultItemProvider == null) {
 			testResultItemProvider = new TestResultItemProvider(this);
 		}
 
@@ -175,7 +167,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestDiffItemProvider testDiffItemProvider;
@@ -184,14 +176,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestDiffAdapter()
-	{
-		if (testDiffItemProvider == null)
-		{
+	public Adapter createTestDiffAdapter() {
+		if (testDiffItemProvider == null) {
 			testDiffItemProvider = new TestDiffItemProvider(this);
 		}
 
@@ -203,7 +193,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected DiffReportItemProvider diffReportItemProvider;
@@ -212,14 +202,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createDiffReportAdapter()
-	{
-		if (diffReportItemProvider == null)
-		{
+	public Adapter createDiffReportAdapter() {
+		if (diffReportItemProvider == null) {
 			diffReportItemProvider = new DiffReportItemProvider(this);
 		}
 
@@ -231,7 +219,7 @@
 	 * instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected RootItemProvider rootItemProvider;
@@ -240,14 +228,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createRootAdapter()
-	{
-		if (rootItemProvider == null)
-		{
+	public Adapter createRootAdapter() {
+		if (rootItemProvider == null) {
 			rootItemProvider = new RootItemProvider(this);
 		}
 
@@ -259,7 +245,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected MutatorConfigItemProvider mutatorConfigItemProvider;
@@ -268,14 +254,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createMutatorConfigAdapter()
-	{
-		if (mutatorConfigItemProvider == null)
-		{
+	public Adapter createMutatorConfigAdapter() {
+		if (mutatorConfigItemProvider == null) {
 			mutatorConfigItemProvider = new MutatorConfigItemProvider(this);
 		}
 
@@ -286,11 +270,10 @@
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public ComposeableAdapterFactory getRootAdapterFactory()
-	{
+	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
 
@@ -298,23 +281,21 @@
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
-	{
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean isFactoryForType(Object type)
-	{
+	public boolean isFactoryForType(Object type) {
 		return supportedTypes.contains(type) || super.isFactoryForType(type);
 	}
 
@@ -322,29 +303,25 @@
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter adapt(Notifier notifier, Object type)
-	{
+	public Adapter adapt(Notifier notifier, Object type) {
 		return super.adapt(notifier, this);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object adapt(Object object, Object type)
-	{
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -356,11 +333,10 @@
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void addListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
@@ -368,11 +344,10 @@
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
 
@@ -380,15 +355,13 @@
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void fireNotifyChanged(Notification notification)
-	{
+	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -397,32 +370,24 @@
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void dispose()
-	{
-		if (testConfigItemProvider != null) {
+	public void dispose() {
+		if (testConfigItemProvider != null)
 			testConfigItemProvider.dispose();
-		}
-		if (testRunItemProvider != null) {
+		if (testRunItemProvider != null)
 			testRunItemProvider.dispose();
-		}
-		if (testResultItemProvider != null) {
+		if (testResultItemProvider != null)
 			testResultItemProvider.dispose();
-		}
-		if (testDiffItemProvider != null) {
+		if (testDiffItemProvider != null)
 			testDiffItemProvider.dispose();
-		}
-		if (diffReportItemProvider != null) {
+		if (diffReportItemProvider != null)
 			diffReportItemProvider.dispose();
-		}
-		if (rootItemProvider != null) {
+		if (rootItemProvider != null)
 			rootItemProvider.dispose();
-		}
-		if (mutatorConfigItemProvider != null) {
+		if (mutatorConfigItemProvider != null)
 			mutatorConfigItemProvider.dispose();
-		}
 	}
 
 }
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java
index 65901a6..45712a8 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/DiffReportItemProvider.java
@@ -32,26 +32,22 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class DiffReportItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public DiffReportItemProvider(AdapterFactory adapterFactory)
-	{
+	public DiffReportItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -59,14 +55,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -79,14 +73,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ConfigPackage.Literals.DIFF_REPORT__DIFFS);
 		}
@@ -96,12 +88,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -112,12 +103,11 @@
 	 * This returns DiffReport.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/DiffReport")); //$NON-NLS-1$
 	}
 
@@ -125,12 +115,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		return getString("_UI_DiffReport_type"); //$NON-NLS-1$
 	}
 
@@ -139,16 +128,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(DiffReport.class))
-		{
+		switch (notification.getFeatureID(DiffReport.class)) {
 		case ConfigPackage.DIFF_REPORT__DIFFS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -161,30 +148,26 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.DIFF_REPORT__DIFFS,
-				ConfigFactory.eINSTANCE.createTestDiff()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.DIFF_REPORT__DIFFS,
+			ConfigFactory.eINSTANCE.createTestDiff()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java
index 6c575e8..39fbca1 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/MutatorConfigItemProvider.java
@@ -33,26 +33,22 @@
  * object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class MutatorConfigItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public MutatorConfigItemProvider(AdapterFactory adapterFactory)
-	{
+	public MutatorConfigItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -60,14 +56,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addRootEClassPropertyDescriptor(object);
@@ -89,19 +83,16 @@
 	 * This adds a property descriptor for the Root EClass feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addRootEClassPropertyDescriptor(Object object)
-	{
+	protected void addRootEClassPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_rootEClass_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_rootEClass_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_rootEClass_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__ROOT_ECLASS,
 				true,
 				false,
@@ -115,19 +106,16 @@
 	 * This adds a property descriptor for the Min Objects Count feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addMinObjectsCountPropertyDescriptor(Object object)
-	{
+	protected void addMinObjectsCountPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_minObjectsCount_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_minObjectsCount_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_minObjectsCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__MIN_OBJECTS_COUNT,
 				true,
 				false,
@@ -141,19 +129,16 @@
 	 * This adds a property descriptor for the Ignore And Log feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addIgnoreAndLogPropertyDescriptor(Object object)
-	{
+	protected void addIgnoreAndLogPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_ignoreAndLog_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ignoreAndLog_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ignoreAndLog_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__IGNORE_AND_LOG,
 				true,
 				false,
@@ -167,19 +152,16 @@
 	 * This adds a property descriptor for the Do Not Generate Root feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addDoNotGenerateRootPropertyDescriptor(Object object)
-	{
+	protected void addDoNotGenerateRootPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_doNotGenerateRoot_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_doNotGenerateRoot_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_doNotGenerateRoot_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT,
 				true,
 				false,
@@ -190,22 +172,19 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the Use Ecore ESFuzzyUtil Delete feature.
+	 * This adds a property descriptor for the Use Ecore Util Delete feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addUseEcoreUtilDeletePropertyDescriptor(Object object)
-	{
+	protected void addUseEcoreUtilDeletePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_useEcoreUtilDelete_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_useEcoreUtilDelete_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_useEcoreUtilDelete_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__USE_ECORE_UTIL_DELETE,
 				true,
 				false,
@@ -219,19 +198,16 @@
 	 * This adds a property descriptor for the EClasses To Ignore feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addEClassesToIgnorePropertyDescriptor(Object object)
-	{
+	protected void addEClassesToIgnorePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_eClassesToIgnore_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eClassesToIgnore_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eClassesToIgnore_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__ECLASSES_TO_IGNORE,
 				true,
 				false,
@@ -245,19 +221,16 @@
 	 * This adds a property descriptor for the EStructural Features To Ignore feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addEStructuralFeaturesToIgnorePropertyDescriptor(Object object)
-	{
+	protected void addEStructuralFeaturesToIgnorePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_eStructuralFeaturesToIgnore_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eStructuralFeaturesToIgnore_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_eStructuralFeaturesToIgnore_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__ESTRUCTURAL_FEATURES_TO_IGNORE,
 				true,
 				false,
@@ -271,19 +244,16 @@
 	 * This adds a property descriptor for the EPackages feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addEPackagesPropertyDescriptor(Object object)
-	{
+	protected void addEPackagesPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_ePackages_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ePackages_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_ePackages_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__EPACKAGES,
 				true,
 				false,
@@ -297,19 +267,16 @@
 	 * This adds a property descriptor for the Max Delete Count feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addMaxDeleteCountPropertyDescriptor(Object object)
-	{
+	protected void addMaxDeleteCountPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_maxDeleteCount_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_maxDeleteCount_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_maxDeleteCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__MAX_DELETE_COUNT,
 				true,
 				false,
@@ -323,19 +290,16 @@
 	 * This adds a property descriptor for the Mutation Count feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addMutationCountPropertyDescriptor(Object object)
-	{
+	protected void addMutationCountPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_mutationCount_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_mutationCount_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_mutationCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__MUTATION_COUNT,
 				true,
 				false,
@@ -349,19 +313,16 @@
 	 * This adds a property descriptor for the Allow Duplicate IDs feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addAllowDuplicateIDsPropertyDescriptor(Object object)
-	{
+	protected void addAllowDuplicateIDsPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_MutatorConfig_allowDuplicateIDs_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_MutatorConfig_allowDuplicateIDs_feature", "_UI_MutatorConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_MutatorConfig_allowDuplicateIDs_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_MutatorConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.MUTATOR_CONFIG__ALLOW_DUPLICATE_IDS,
 				true,
 				false,
@@ -375,12 +336,11 @@
 	 * This returns MutatorConfig.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/MutatorConfig")); //$NON-NLS-1$
 	}
 
@@ -388,13 +348,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final MutatorConfig mutatorConfig = (MutatorConfig) object;
+	public String getText(Object object) {
+		MutatorConfig mutatorConfig = (MutatorConfig) object;
 		return getString("_UI_MutatorConfig_type") + " " + mutatorConfig.getMinObjectsCount(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -403,16 +362,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(MutatorConfig.class))
-		{
+		switch (notification.getFeatureID(MutatorConfig.class)) {
 		case ConfigPackage.MUTATOR_CONFIG__MIN_OBJECTS_COUNT:
 		case ConfigPackage.MUTATOR_CONFIG__IGNORE_AND_LOG:
 		case ConfigPackage.MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT:
@@ -431,12 +388,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -444,12 +400,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java
index efb2e2a..b8e7ca8 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/RootItemProvider.java
@@ -32,26 +32,22 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class RootItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public RootItemProvider(AdapterFactory adapterFactory)
-	{
+	public RootItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -59,14 +55,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -79,14 +73,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ConfigPackage.Literals.ROOT__ELEMENTS);
 		}
@@ -96,12 +88,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -112,12 +103,11 @@
 	 * This returns Root.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/Root")); //$NON-NLS-1$
 	}
 
@@ -125,12 +115,11 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		return getString("_UI_Root_type"); //$NON-NLS-1$
 	}
 
@@ -139,16 +128,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Root.class))
-		{
+		switch (notification.getFeatureID(Root.class)) {
 		case ConfigPackage.ROOT__ELEMENTS:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -161,60 +148,44 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createTestConfig()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createTestConfig()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createTestRun()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createTestRun()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createTestResult()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createTestResult()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createTestDiff()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createTestDiff()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createDiffReport()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createDiffReport()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createRoot()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createRoot()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.ROOT__ELEMENTS,
-				ConfigFactory.eINSTANCE.createMutatorConfig()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.ROOT__ELEMENTS,
+			ConfigFactory.eINSTANCE.createMutatorConfig()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java
index c26f7b0..98a0d75 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestConfigItemProvider.java
@@ -34,26 +34,22 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestConfigItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestConfigItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestConfigItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -61,14 +57,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addSeedPropertyDescriptor(object);
@@ -83,14 +77,12 @@
 	 * This adds a property descriptor for the Seed feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addSeedPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addSeedPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestConfig_seed_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_seed_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -107,14 +99,12 @@
 	 * This adds a property descriptor for the Count feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addCountPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addCountPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestConfig_count_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_count_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -128,21 +118,19 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the ESFuzzyTest Class feature.
+	 * This adds a property descriptor for the Test Class feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addTestClassPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addTestClassPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestConfig_testClass_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestConfig_testClass_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_testClass_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestConfig_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.TEST_CONFIG__TEST_CLASS,
 				true,
 				false,
@@ -156,14 +144,12 @@
 	 * This adds a property descriptor for the Id feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addIdPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addIdPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestConfig_id_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestConfig_id_feature", "_UI_TestConfig_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -182,14 +168,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ConfigPackage.Literals.TEST_CONFIG__MUTATOR_CONFIG);
 		}
@@ -199,12 +183,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -215,12 +198,11 @@
 	 * This returns TestConfig.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestConfig")); //$NON-NLS-1$
 	}
 
@@ -228,15 +210,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((TestConfig) object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TestConfig_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((TestConfig) object).getId();
+		return label == null || label.length() == 0 ? getString("_UI_TestConfig_type") : //$NON-NLS-1$
 			getString("_UI_TestConfig_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -245,16 +225,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TestConfig.class))
-		{
+		switch (notification.getFeatureID(TestConfig.class)) {
 		case ConfigPackage.TEST_CONFIG__SEED:
 		case ConfigPackage.TEST_CONFIG__COUNT:
 		case ConfigPackage.TEST_CONFIG__TEST_CLASS:
@@ -273,30 +251,26 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.TEST_CONFIG__MUTATOR_CONFIG,
-				ConfigFactory.eINSTANCE.createMutatorConfig()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_CONFIG__MUTATOR_CONFIG,
+			ConfigFactory.eINSTANCE.createMutatorConfig()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java
index 2938dd0..c76b64c 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestDiffItemProvider.java
@@ -35,26 +35,22 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestDiffItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestDiffItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestDiffItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -62,14 +58,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addLastUpdatePropertyDescriptor(object);
@@ -82,15 +76,12 @@
 	 * This adds a property descriptor for the Last Update feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addLastUpdatePropertyDescriptor(Object object)
-	{
+	protected void addLastUpdatePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestDiff_lastUpdate_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestDiff_lastUpdate_feature", "_UI_TestDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -107,14 +98,12 @@
 	 * This adds a property descriptor for the Config feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addConfigPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addConfigPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestDiff_config_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestDiff_config_feature", "_UI_TestDiff_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -133,14 +122,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ConfigPackage.Literals.TEST_DIFF__OLD_RESULT);
 			childrenFeatures.add(ConfigPackage.Literals.TEST_DIFF__NEW_RESULT);
@@ -151,12 +138,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -167,12 +153,11 @@
 	 * This returns TestDiff.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestDiff")); //$NON-NLS-1$
 	}
 
@@ -180,16 +165,14 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final Date labelValue = ((TestDiff) object).getLastUpdate();
-		final String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TestDiff_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		Date labelValue = ((TestDiff) object).getLastUpdate();
+		String label = labelValue == null ? null : labelValue.toString();
+		return label == null || label.length() == 0 ? getString("_UI_TestDiff_type") : //$NON-NLS-1$
 			getString("_UI_TestDiff_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -198,16 +181,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TestDiff.class))
-		{
+		switch (notification.getFeatureID(TestDiff.class)) {
 		case ConfigPackage.TEST_DIFF__LAST_UPDATE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -224,44 +205,36 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.TEST_DIFF__OLD_RESULT,
-				ConfigFactory.eINSTANCE.createTestResult()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_DIFF__OLD_RESULT,
+			ConfigFactory.eINSTANCE.createTestResult()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.TEST_DIFF__NEW_RESULT,
-				ConfigFactory.eINSTANCE.createTestResult()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_DIFF__NEW_RESULT,
+			ConfigFactory.eINSTANCE.createTestResult()));
 	}
 
 	/**
 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
-	{
-		final Object childFeature = feature;
-		final Object childObject = child;
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
+		Object childFeature = feature;
+		Object childObject = child;
 
-		final boolean qualify =
-			childFeature == ConfigPackage.Literals.TEST_DIFF__OLD_RESULT ||
-				childFeature == ConfigPackage.Literals.TEST_DIFF__NEW_RESULT;
+		boolean qualify = childFeature == ConfigPackage.Literals.TEST_DIFF__OLD_RESULT ||
+			childFeature == ConfigPackage.Literals.TEST_DIFF__NEW_RESULT;
 
-		if (qualify)
-		{
+		if (qualify) {
 			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
 				new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
@@ -272,12 +245,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java
index 910c2e4..5d7aea0 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestResultItemProvider.java
@@ -32,26 +32,22 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestResultItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestResultItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestResultItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -59,14 +55,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addSeedCountPropertyDescriptor(object);
@@ -82,18 +76,16 @@
 	 * This adds a property descriptor for the Seed Count feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addSeedCountPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addSeedCountPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestResult_seedCount_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestResult_seedCount_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestResult_seedCount_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestResult_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.TEST_RESULT__SEED_COUNT,
 				true,
 				false,
@@ -104,21 +96,19 @@
 	}
 
 	/**
-	 * This adds a property descriptor for the ESFuzzyTest Name feature.
+	 * This adds a property descriptor for the Test Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addTestNamePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addTestNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestResult_testName_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestResult_testName_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestResult_testName_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestResult_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.TEST_RESULT__TEST_NAME,
 				true,
 				false,
@@ -132,14 +122,12 @@
 	 * This adds a property descriptor for the Error feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addErrorPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addErrorPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestResult_error_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestResult_error_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -156,18 +144,16 @@
 	 * This adds a property descriptor for the Failure feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addFailurePropertyDescriptor(Object object)
-	{
+	protected void addFailurePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestResult_failure_feature"), //$NON-NLS-1$
-				getString("_UI_PropertyDescriptor_description", "_UI_TestResult_failure_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestResult_failure_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestResult_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.TEST_RESULT__FAILURE,
 				true,
 				false,
@@ -181,19 +167,16 @@
 	 * This adds a property descriptor for the Execution Time feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addExecutionTimePropertyDescriptor(Object object)
-	{
+	protected void addExecutionTimePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestResult_executionTime_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestResult_executionTime_feature", "_UI_TestResult_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestResult_executionTime_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestResult_type"), //$NON-NLS-1$
 				ConfigPackage.Literals.TEST_RESULT__EXECUTION_TIME,
 				true,
 				false,
@@ -207,12 +190,11 @@
 	 * This returns TestResult.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestResult")); //$NON-NLS-1$
 	}
 
@@ -220,15 +202,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((TestResult) object).getTestName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TestResult_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((TestResult) object).getTestName();
+		return label == null || label.length() == 0 ? getString("_UI_TestResult_type") : //$NON-NLS-1$
 			getString("_UI_TestResult_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -237,16 +217,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TestResult.class))
-		{
+		switch (notification.getFeatureID(TestResult.class)) {
 		case ConfigPackage.TEST_RESULT__SEED_COUNT:
 		case ConfigPackage.TEST_RESULT__TEST_NAME:
 		case ConfigPackage.TEST_RESULT__ERROR:
@@ -263,12 +241,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -276,12 +253,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java
index 591793f..8f823e0 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.edit/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/provider/TestRunItemProvider.java
@@ -41,11 +41,8 @@
 public class TestRunItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -53,8 +50,7 @@
 	 *
 	 * @generated
 	 */
-	public TestRunItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestRunItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -66,10 +62,8 @@
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addTimePropertyDescriptor(object);
@@ -84,11 +78,9 @@
 	 *
 	 * @generated
 	 */
-	protected void addTimePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addTimePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestRun_time_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestRun_time_feature", "_UI_TestRun_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -111,10 +103,8 @@
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(ConfigPackage.Literals.TEST_RUN__CONFIG);
 			childrenFeatures.add(ConfigPackage.Literals.TEST_RUN__RESULTS);
@@ -129,8 +119,7 @@
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -145,8 +134,7 @@
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestRun")); //$NON-NLS-1$
 	}
 
@@ -158,12 +146,10 @@
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
+	public String getText(Object object) {
 		final Date labelValue = ((TestRun) object).getTime();
 		final String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TestRun_type") : //$NON-NLS-1$
+		return label == null || label.length() == 0 ? getString("_UI_TestRun_type") : //$NON-NLS-1$
 			getString("_UI_TestRun_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -176,12 +162,10 @@
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TestRun.class))
-		{
+		switch (notification.getFeatureID(TestRun.class)) {
 		case ConfigPackage.TEST_RUN__TIME:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -202,19 +186,14 @@
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.TEST_RUN__CONFIG,
-				ConfigFactory.eINSTANCE.createTestConfig()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_RUN__CONFIG,
+			ConfigFactory.eINSTANCE.createTestConfig()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(ConfigPackage.Literals.TEST_RUN__RESULTS,
-				ConfigFactory.eINSTANCE.createTestResult()));
+		newChildDescriptors.add(createChildParameter(ConfigPackage.Literals.TEST_RUN__RESULTS,
+			ConfigFactory.eINSTANCE.createTestResult()));
 	}
 
 	/**
@@ -225,8 +204,7 @@
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return ConfigEditPlugin.INSTANCE;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java
index 242b4c7..1cd07fd 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigActionBarContributor.java
@@ -51,8 +51,7 @@
  */
 public class ConfigActionBarContributor
 	extends EditingDomainActionBarContributor
-	implements ISelectionChangedListener
-{
+	implements ISelectionChangedListener {
 	/**
 	 * This keeps track of the active editor.
 	 * <!-- begin-user-doc -->
@@ -78,22 +77,18 @@
 	 *
 	 * @generated
 	 */
-	protected IAction showPropertiesViewAction =
-		new Action(ConfigEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
-		{
-			@Override
-			public void run()
-			{
-				try
-				{
-					getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
-				}
-				catch (final PartInitException exception)
-				{
-					ConfigEditorPlugin.INSTANCE.log(exception);
-				}
+	protected IAction showPropertiesViewAction = new Action(
+		ConfigEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
+	{
+		@Override
+		public void run() {
+			try {
+				getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
+			} catch (final PartInitException exception) {
+				ConfigEditorPlugin.INSTANCE.log(exception);
 			}
-		};
+		}
+	};
 
 	/**
 	 * This action refreshes the viewer of the current editor if the editor
@@ -103,28 +98,24 @@
 	 *
 	 * @generated
 	 */
-	protected IAction refreshViewerAction =
-		new Action(ConfigEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
-		{
-			@Override
-			public boolean isEnabled()
-			{
-				return activeEditorPart instanceof IViewerProvider;
-			}
+	protected IAction refreshViewerAction = new Action(
+		ConfigEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
+	{
+		@Override
+		public boolean isEnabled() {
+			return activeEditorPart instanceof IViewerProvider;
+		}
 
-			@Override
-			public void run()
-			{
-				if (activeEditorPart instanceof IViewerProvider)
-				{
-					final Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-					if (viewer != null)
-					{
-						viewer.refresh();
-					}
+		@Override
+		public void run() {
+			if (activeEditorPart instanceof IViewerProvider) {
+				final Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
+				if (viewer != null) {
+					viewer.refresh();
 				}
 			}
-		};
+		}
+	};
 
 	/**
 	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
@@ -171,8 +162,7 @@
 	 *
 	 * @generated
 	 */
-	public ConfigActionBarContributor()
-	{
+	public ConfigActionBarContributor() {
 		super(ADDITIONS_LAST_STYLE);
 		loadResourceAction = new LoadResourceAction();
 		validateAction = new ValidateAction();
@@ -187,8 +177,7 @@
 	 * @generated
 	 */
 	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager)
-	{
+	public void contributeToToolBar(IToolBarManager toolBarManager) {
 		toolBarManager.add(new Separator("config-settings")); //$NON-NLS-1$
 		toolBarManager.add(new Separator("config-additions")); //$NON-NLS-1$
 	}
@@ -202,12 +191,12 @@
 	 * @generated
 	 */
 	@Override
-	public void contributeToMenu(IMenuManager menuManager)
-	{
+	public void contributeToMenu(IMenuManager menuManager) {
 		super.contributeToMenu(menuManager);
 
 		final IMenuManager submenuManager = new MenuManager(
-			ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditor_menu"), "org.eclipse.emf.emfstore.internal.fuzzy.emf.configMenuID"); //$NON-NLS-1$ //$NON-NLS-2$
+			ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditor_menu"), //$NON-NLS-1$
+			"org.eclipse.emf.emfstore.internal.fuzzy.emf.configMenuID"); //$NON-NLS-1$
 		menuManager.insertAfter("additions", submenuManager); //$NON-NLS-1$
 		submenuManager.add(new Separator("settings")); //$NON-NLS-1$
 		submenuManager.add(new Separator("actions")); //$NON-NLS-1$
@@ -221,19 +210,17 @@
 
 		// Prepare for CreateSibling item addition or removal.
 		//
-		createSiblingMenuManager = new MenuManager(ConfigEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
+		createSiblingMenuManager = new MenuManager(
+			ConfigEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item")); //$NON-NLS-1$
 		submenuManager.insertBefore("additions", createSiblingMenuManager); //$NON-NLS-1$
 
 		// Force an update because Eclipse hides empty menus now.
 		//
-		submenuManager.addMenuListener
-			(new IMenuListener()
-			{
-				public void menuAboutToShow(IMenuManager menuManager)
-				{
-					menuManager.updateAll(true);
-				}
-			});
+		submenuManager.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager menuManager) {
+				menuManager.updateAll(true);
+			}
+		});
 
 		addGlobalActions(submenuManager);
 	}
@@ -246,30 +233,24 @@
 	 * @generated
 	 */
 	@Override
-	public void setActiveEditor(IEditorPart part)
-	{
+	public void setActiveEditor(IEditorPart part) {
 		super.setActiveEditor(part);
 		activeEditorPart = part;
 
 		// Switch to the new selection provider.
 		//
-		if (selectionProvider != null)
-		{
+		if (selectionProvider != null) {
 			selectionProvider.removeSelectionChangedListener(this);
 		}
-		if (part == null)
-		{
+		if (part == null) {
 			selectionProvider = null;
-		}
-		else
-		{
+		} else {
 			selectionProvider = part.getSite().getSelectionProvider();
 			selectionProvider.addSelectionChangedListener(this);
 
 			// Fake a selection changed event to update the menus.
 			//
-			if (selectionProvider.getSelection() != null)
-			{
+			if (selectionProvider.getSelection() != null) {
 				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
 			}
 		}
@@ -284,16 +265,13 @@
 	 *
 	 * @generated
 	 */
-	public void selectionChanged(SelectionChangedEvent event)
-	{
+	public void selectionChanged(SelectionChangedEvent event) {
 		// Remove any menu items for old selection.
 		//
-		if (createChildMenuManager != null)
-		{
+		if (createChildMenuManager != null) {
 			depopulateManager(createChildMenuManager, createChildActions);
 		}
-		if (createSiblingMenuManager != null)
-		{
+		if (createSiblingMenuManager != null) {
 			depopulateManager(createSiblingMenuManager, createSiblingActions);
 		}
 
@@ -303,8 +281,7 @@
 		Collection<?> newSiblingDescriptors = null;
 
 		final ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1)
-		{
+		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
 			final Object object = ((IStructuredSelection) selection).getFirstElement();
 
 			final EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
@@ -318,13 +295,11 @@
 		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
 		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
 
-		if (createChildMenuManager != null)
-		{
+		if (createChildMenuManager != null) {
 			populateManager(createChildMenuManager, createChildActions, null);
 			createChildMenuManager.update(true);
 		}
-		if (createSiblingMenuManager != null)
-		{
+		if (createSiblingMenuManager != null) {
 			populateManager(createSiblingMenuManager, createSiblingActions, null);
 			createSiblingMenuManager.update(true);
 		}
@@ -339,13 +314,10 @@
 	 *
 	 * @generated
 	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection)
-	{
+	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
 		final Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null)
-		{
-			for (final Object descriptor : descriptors)
-			{
+		if (descriptors != null) {
+			for (final Object descriptor : descriptors) {
 				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
 			}
 		}
@@ -361,13 +333,10 @@
 	 *
 	 * @generated
 	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection)
-	{
+	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
 		final Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null)
-		{
-			for (final Object descriptor : descriptors)
-			{
+		if (descriptors != null) {
+			for (final Object descriptor : descriptors) {
 				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
 			}
 		}
@@ -385,18 +354,12 @@
 	 * @generated
 	 */
 	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions,
-		String contributionID)
-	{
-		if (actions != null)
-		{
-			for (final IAction action : actions)
-			{
-				if (contributionID != null)
-				{
+		String contributionID) {
+		if (actions != null) {
+			for (final IAction action : actions) {
+				if (contributionID != null) {
 					manager.insertBefore(contributionID, action);
-				}
-				else
-				{
+				} else {
 					manager.add(action);
 				}
 			}
@@ -411,28 +374,22 @@
 	 *
 	 * @generated
 	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions)
-	{
-		if (actions != null)
-		{
+	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+		if (actions != null) {
 			final IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++)
-			{
+			for (int i = 0; i < items.length; i++) {
 				// Look into SubContributionItems
 				//
 				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem)
-				{
+				while (contributionItem instanceof SubContributionItem) {
 					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
 				}
 
 				// Delete the ActionContributionItems with matching action.
 				//
-				if (contributionItem instanceof ActionContributionItem)
-				{
+				if (contributionItem instanceof ActionContributionItem) {
 					final IAction action = ((ActionContributionItem) contributionItem).getAction();
-					if (actions.contains(action))
-					{
+					if (actions.contains(action)) {
 						manager.remove(contributionItem);
 					}
 				}
@@ -448,8 +405,7 @@
 	 * @generated
 	 */
 	@Override
-	public void menuAboutToShow(IMenuManager menuManager)
-	{
+	public void menuAboutToShow(IMenuManager menuManager) {
 		super.menuAboutToShow(menuManager);
 		MenuManager submenuManager = null;
 
@@ -470,8 +426,7 @@
 	 * @generated
 	 */
 	@Override
-	protected void addGlobalActions(IMenuManager menuManager)
-	{
+	protected void addGlobalActions(IMenuManager menuManager) {
 		menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
 		menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
 
@@ -489,8 +444,7 @@
 	 * @generated
 	 */
 	@Override
-	protected boolean removeAllReferencesOnDelete()
-	{
+	protected boolean removeAllReferencesOnDelete() {
 		return true;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java
index b200102..b051e06 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditor.java
@@ -133,8 +133,7 @@
  */
 public class ConfigEditor
 	extends MultiPageEditorPart
-	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker
-{
+	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
 	/**
 	 * This keeps track of the editing domain that is used to track all changes to the model.
 	 * <!-- begin-user-doc -->
@@ -310,54 +309,40 @@
 	 *
 	 * @generated
 	 */
-	protected IPartListener partListener =
-		new IPartListener()
-		{
-			public void partActivated(IWorkbenchPart p)
-			{
-				if (p instanceof ContentOutline)
-				{
-					if (((ContentOutline) p).getCurrentPage() == contentOutlinePage)
-					{
-						getActionBarContributor().setActiveEditor(ConfigEditor.this);
+	protected IPartListener partListener = new IPartListener() {
+		public void partActivated(IWorkbenchPart p) {
+			if (p instanceof ContentOutline) {
+				if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
+					getActionBarContributor().setActiveEditor(ConfigEditor.this);
 
-						setCurrentViewer(contentOutlineViewer);
-					}
+					setCurrentViewer(contentOutlineViewer);
 				}
-				else if (p instanceof PropertySheet)
-				{
-					if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage()))
-					{
-						getActionBarContributor().setActiveEditor(ConfigEditor.this);
-						handleActivate();
-					}
-				}
-				else if (p == ConfigEditor.this)
-				{
+			} else if (p instanceof PropertySheet) {
+				if (propertySheetPages.contains(((PropertySheet) p).getCurrentPage())) {
+					getActionBarContributor().setActiveEditor(ConfigEditor.this);
 					handleActivate();
 				}
+			} else if (p == ConfigEditor.this) {
+				handleActivate();
 			}
+		}
 
-			public void partBroughtToTop(IWorkbenchPart p)
-			{
-				// Ignore.
-			}
+		public void partBroughtToTop(IWorkbenchPart p) {
+			// Ignore.
+		}
 
-			public void partClosed(IWorkbenchPart p)
-			{
-				// Ignore.
-			}
+		public void partClosed(IWorkbenchPart p) {
+			// Ignore.
+		}
 
-			public void partDeactivated(IWorkbenchPart p)
-			{
-				// Ignore.
-			}
+		public void partDeactivated(IWorkbenchPart p) {
+			// Ignore.
+		}
 
-			public void partOpened(IWorkbenchPart p)
-			{
-				// Ignore.
-			}
-		};
+		public void partOpened(IWorkbenchPart p) {
+			// Ignore.
+		}
+	};
 
 	/**
 	 * Resources that have been removed since last activation.
@@ -411,76 +396,55 @@
 	 *
 	 * @generated
 	 */
-	protected EContentAdapter problemIndicationAdapter =
-		new EContentAdapter()
-		{
-			@Override
-			public void notifyChanged(Notification notification)
-			{
-				if (notification.getNotifier() instanceof Resource)
-				{
-					switch (notification.getFeatureID(Resource.class))
-					{
-					case Resource.RESOURCE__IS_LOADED:
-					case Resource.RESOURCE__ERRORS:
-					case Resource.RESOURCE__WARNINGS:
-					{
-						final Resource resource = (Resource) notification.getNotifier();
-						final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-						if (diagnostic.getSeverity() != Diagnostic.OK)
-						{
-							resourceToDiagnosticMap.put(resource, diagnostic);
-						}
-						else
-						{
-							resourceToDiagnosticMap.remove(resource);
-						}
-
-						if (updateProblemIndication)
-						{
-							getSite().getShell().getDisplay().asyncExec
-								(new Runnable()
-								{
-									public void run()
-									{
-										updateProblemIndication();
-									}
-								});
-						}
-						break;
+	protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
+		@Override
+		public void notifyChanged(Notification notification) {
+			if (notification.getNotifier() instanceof Resource) {
+				switch (notification.getFeatureID(Resource.class)) {
+				case Resource.RESOURCE__IS_LOADED:
+				case Resource.RESOURCE__ERRORS:
+				case Resource.RESOURCE__WARNINGS: {
+					final Resource resource = (Resource) notification.getNotifier();
+					final Diagnostic diagnostic = analyzeResourceProblems(resource, null);
+					if (diagnostic.getSeverity() != Diagnostic.OK) {
+						resourceToDiagnosticMap.put(resource, diagnostic);
+					} else {
+						resourceToDiagnosticMap.remove(resource);
 					}
-					}
-				}
-				else
-				{
-					super.notifyChanged(notification);
-				}
-			}
 
-			@Override
-			protected void setTarget(Resource target)
-			{
-				basicSetTarget(target);
-			}
-
-			@Override
-			protected void unsetTarget(Resource target)
-			{
-				basicUnsetTarget(target);
-				resourceToDiagnosticMap.remove(target);
-				if (updateProblemIndication)
-				{
-					getSite().getShell().getDisplay().asyncExec
-						(new Runnable()
-						{
-							public void run()
-							{
+					if (updateProblemIndication) {
+						getSite().getShell().getDisplay().asyncExec(new Runnable() {
+							public void run() {
 								updateProblemIndication();
 							}
 						});
+					}
+					break;
 				}
+				}
+			} else {
+				super.notifyChanged(notification);
 			}
-		};
+		}
+
+		@Override
+		protected void setTarget(Resource target) {
+			basicSetTarget(target);
+		}
+
+		@Override
+		protected void unsetTarget(Resource target) {
+			basicUnsetTarget(target);
+			resourceToDiagnosticMap.remove(target);
+			if (updateProblemIndication) {
+				getSite().getShell().getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						updateProblemIndication();
+					}
+				});
+			}
+		}
+	};
 
 	/**
 	 * This listens for workspace changes.
@@ -489,100 +453,74 @@
 	 *
 	 * @generated
 	 */
-	protected IResourceChangeListener resourceChangeListener =
-		new IResourceChangeListener()
-		{
-			public void resourceChanged(IResourceChangeEvent event)
-			{
-				final IResourceDelta delta = event.getDelta();
-				try
-				{
-					class ResourceDeltaVisitor implements IResourceDeltaVisitor
-					{
-						protected ResourceSet resourceSet = editingDomain.getResourceSet();
-						protected Collection<Resource> changedResources = new ArrayList<Resource>();
-						protected Collection<Resource> removedResources = new ArrayList<Resource>();
+	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
+		public void resourceChanged(IResourceChangeEvent event) {
+			final IResourceDelta delta = event.getDelta();
+			try {
+				class ResourceDeltaVisitor implements IResourceDeltaVisitor {
+					protected ResourceSet resourceSet = editingDomain.getResourceSet();
+					protected Collection<Resource> changedResources = new ArrayList<Resource>();
+					protected Collection<Resource> removedResources = new ArrayList<Resource>();
 
-						public boolean visit(IResourceDelta delta)
-						{
-							if (delta.getResource().getType() == IResource.FILE)
-							{
-								if (delta.getKind() == IResourceDelta.REMOVED ||
-									delta.getKind() == IResourceDelta.CHANGED
-									&& delta.getFlags() != IResourceDelta.MARKERS)
-								{
-									final Resource resource = resourceSet.getResource(
-										URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-									if (resource != null)
-									{
-										if (delta.getKind() == IResourceDelta.REMOVED)
-										{
-											removedResources.add(resource);
-										}
-										else if (!savedResources.remove(resource))
-										{
-											changedResources.add(resource);
-										}
+					public boolean visit(IResourceDelta delta) {
+						if (delta.getResource().getType() == IResource.FILE) {
+							if (delta.getKind() == IResourceDelta.REMOVED ||
+								delta.getKind() == IResourceDelta.CHANGED
+									&& delta.getFlags() != IResourceDelta.MARKERS) {
+								final Resource resource = resourceSet.getResource(
+									URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
+								if (resource != null) {
+									if (delta.getKind() == IResourceDelta.REMOVED) {
+										removedResources.add(resource);
+									} else if (!savedResources.remove(resource)) {
+										changedResources.add(resource);
 									}
 								}
-								return false;
 							}
-
-							return true;
+							return false;
 						}
 
-						public Collection<Resource> getChangedResources()
-						{
-							return changedResources;
-						}
-
-						public Collection<Resource> getRemovedResources()
-						{
-							return removedResources;
-						}
+						return true;
 					}
 
-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-					delta.accept(visitor);
-
-					if (!visitor.getRemovedResources().isEmpty())
-					{
-						getSite().getShell().getDisplay().asyncExec
-							(new Runnable()
-							{
-								public void run()
-								{
-									removedResources.addAll(visitor.getRemovedResources());
-									if (!isDirty())
-									{
-										getSite().getPage().closeEditor(ConfigEditor.this, false);
-									}
-								}
-							});
+					public Collection<Resource> getChangedResources() {
+						return changedResources;
 					}
 
-					if (!visitor.getChangedResources().isEmpty())
-					{
-						getSite().getShell().getDisplay().asyncExec
-							(new Runnable()
-							{
-								public void run()
-								{
-									changedResources.addAll(visitor.getChangedResources());
-									if (getSite().getPage().getActiveEditor() == ConfigEditor.this)
-									{
-										handleActivate();
-									}
-								}
-							});
+					public Collection<Resource> getRemovedResources() {
+						return removedResources;
 					}
 				}
-				catch (final CoreException exception)
-				{
-					ConfigEditorPlugin.INSTANCE.log(exception);
+
+				final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
+				delta.accept(visitor);
+
+				if (!visitor.getRemovedResources().isEmpty()) {
+					getSite().getShell().getDisplay().asyncExec(new Runnable() {
+						public void run() {
+							removedResources.addAll(visitor.getRemovedResources());
+							if (!isDirty()) {
+								getSite().getPage().closeEditor(ConfigEditor.this, false);
+							}
+						}
+					});
 				}
+
+				if (!visitor.getChangedResources().isEmpty()) {
+					getSite().getShell().getDisplay().asyncExec(new Runnable() {
+						public void run() {
+							changedResources.addAll(visitor.getChangedResources());
+							if (getSite().getPage().getActiveEditor() == ConfigEditor.this) {
+								handleActivate();
+							}
+						}
+					});
+				}
+			} catch (final CoreException exception) {
+				ConfigEditorPlugin.INSTANCE.log(exception);
 			}
-		};
+		}
+	};
 
 	/**
 	 * Handles activation of the editor or it's associated views.
@@ -591,12 +529,10 @@
 	 *
 	 * @generated
 	 */
-	protected void handleActivate()
-	{
+	protected void handleActivate() {
 		// Recompute the read only state.
 		//
-		if (editingDomain.getResourceToReadOnlyMap() != null)
-		{
+		if (editingDomain.getResourceToReadOnlyMap() != null) {
 			editingDomain.getResourceToReadOnlyMap().clear();
 
 			// Refresh any actions that may become enabled or disabled.
@@ -604,21 +540,15 @@
 			setSelection(getSelection());
 		}
 
-		if (!removedResources.isEmpty())
-		{
-			if (handleDirtyConflict())
-			{
+		if (!removedResources.isEmpty()) {
+			if (handleDirtyConflict()) {
 				getSite().getPage().closeEditor(ConfigEditor.this, false);
-			}
-			else
-			{
+			} else {
 				removedResources.clear();
 				changedResources.clear();
 				savedResources.clear();
 			}
-		}
-		else if (!changedResources.isEmpty())
-		{
+		} else if (!changedResources.isEmpty()) {
 			changedResources.removeAll(savedResources);
 			handleChangedResources();
 			changedResources.clear();
@@ -633,37 +563,28 @@
 	 *
 	 * @generated
 	 */
-	protected void handleChangedResources()
-	{
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict()))
-		{
-			if (isDirty())
-			{
+	protected void handleChangedResources() {
+		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
+			if (isDirty()) {
 				changedResources.addAll(editingDomain.getResourceSet().getResources());
 			}
 			editingDomain.getCommandStack().flush();
 
 			updateProblemIndication = false;
-			for (final Resource resource : changedResources)
-			{
-				if (resource.isLoaded())
-				{
+			for (final Resource resource : changedResources) {
+				if (resource.isLoaded()) {
 					resource.unload();
-					try
-					{
+					try {
 						resource.load(Collections.EMPTY_MAP);
-					} catch (final IOException exception)
-					{
-						if (!resourceToDiagnosticMap.containsKey(resource))
-						{
+					} catch (final IOException exception) {
+						if (!resourceToDiagnosticMap.containsKey(resource)) {
 							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
 						}
 					}
 				}
 			}
 
-			if (AdapterFactoryEditingDomain.isStale(editorSelection))
-			{
+			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
 				setSelection(StructuredSelection.EMPTY);
 			}
 
@@ -679,60 +600,45 @@
 	 *
 	 * @generated
 	 */
-	protected void updateProblemIndication()
-	{
-		if (updateProblemIndication)
-		{
-			final BasicDiagnostic diagnostic =
-				new BasicDiagnostic
-				(Diagnostic.OK, "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
-					0,
-					null,
-					new Object[] { editingDomain.getResourceSet() });
-			for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values())
-			{
-				if (childDiagnostic.getSeverity() != Diagnostic.OK)
-				{
+	protected void updateProblemIndication() {
+		if (updateProblemIndication) {
+			final BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK,
+				"org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
+				0,
+				null,
+				new Object[] { editingDomain.getResourceSet() });
+			for (final Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
+				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
 					diagnostic.add(childDiagnostic);
 				}
 			}
 
 			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart)
-			{
+			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
 				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK)
-				{
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
 					setActivePage(lastEditorPage);
 				}
-			}
-			else if (diagnostic.getSeverity() != Diagnostic.OK)
-			{
+			} else if (diagnostic.getSeverity() != Diagnostic.OK) {
 				final ProblemEditorPart problemEditorPart = new ProblemEditorPart();
 				problemEditorPart.setDiagnostic(diagnostic);
 				problemEditorPart.setMarkerHelper(markerHelper);
-				try
-				{
+				try {
 					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
 					setPageText(lastEditorPage, problemEditorPart.getPartName());
 					setActivePage(lastEditorPage);
 					showTabs();
-				} catch (final PartInitException exception)
-				{
+				} catch (final PartInitException exception) {
 					ConfigEditorPlugin.INSTANCE.log(exception);
 				}
 			}
 
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet()))
-			{
+			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
 				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK)
-				{
-					try
-					{
+				if (diagnostic.getSeverity() != Diagnostic.OK) {
+					try {
 						markerHelper.createMarkers(diagnostic);
-					} catch (final CoreException exception)
-					{
+					} catch (final CoreException exception) {
 						ConfigEditorPlugin.INSTANCE.log(exception);
 					}
 				}
@@ -747,12 +653,10 @@
 	 *
 	 * @generated
 	 */
-	protected boolean handleDirtyConflict()
-	{
-		return MessageDialog.openQuestion
-			(getSite().getShell(),
-				getString("_UI_FileConflict_label"), //$NON-NLS-1$
-				getString("_WARN_FileConflict")); //$NON-NLS-1$
+	protected boolean handleDirtyConflict() {
+		return MessageDialog.openQuestion(getSite().getShell(),
+			getString("_UI_FileConflict_label"), //$NON-NLS-1$
+			getString("_WARN_FileConflict")); //$NON-NLS-1$
 	}
 
 	/**
@@ -762,8 +666,7 @@
 	 *
 	 * @generated
 	 */
-	public ConfigEditor()
-	{
+	public ConfigEditor() {
 		super();
 		initializeEditingDomain();
 	}
@@ -775,8 +678,7 @@
 	 *
 	 * @generated
 	 */
-	protected void initializeEditingDomain()
-	{
+	protected void initializeEditingDomain() {
 		// Create an adapter factory that yields item providers.
 		//
 		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
@@ -792,42 +694,31 @@
 		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with
 		// focus.
 		//
-		commandStack.addCommandStackListener
-			(new CommandStackListener()
-			{
-				public void commandStackChanged(final EventObject event)
-				{
-					getContainer().getDisplay().asyncExec
-						(new Runnable()
-						{
-							public void run()
-							{
-								firePropertyChange(IEditorPart.PROP_DIRTY);
+		commandStack.addCommandStackListener(new CommandStackListener() {
+			public void commandStackChanged(final EventObject event) {
+				getContainer().getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						firePropertyChange(IEditorPart.PROP_DIRTY);
 
-								// Try to select the affected objects.
-								//
-								final Command mostRecentCommand = ((CommandStack) event.getSource())
-									.getMostRecentCommand();
-								if (mostRecentCommand != null)
-								{
-									setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-								}
-								for (final Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();)
-								{
-									final PropertySheetPage propertySheetPage = i.next();
-									if (propertySheetPage.getControl().isDisposed())
-									{
-										i.remove();
-									}
-									else
-									{
-										propertySheetPage.refresh();
-									}
-								}
+						// Try to select the affected objects.
+						//
+						final Command mostRecentCommand = ((CommandStack) event.getSource())
+							.getMostRecentCommand();
+						if (mostRecentCommand != null) {
+							setSelectionToViewer(mostRecentCommand.getAffectedObjects());
+						}
+						for (final Iterator<PropertySheetPage> i = propertySheetPages.iterator(); i.hasNext();) {
+							final PropertySheetPage propertySheetPage = i.next();
+							if (propertySheetPage.getControl().isDisposed()) {
+								i.remove();
+							} else {
+								propertySheetPage.refresh();
 							}
-						});
-				}
-			});
+						}
+					}
+				});
+			}
+		});
 
 		// Create the editing domain with a special command stack.
 		//
@@ -842,8 +733,7 @@
 	 * @generated
 	 */
 	@Override
-	protected void firePropertyChange(int action)
-	{
+	protected void firePropertyChange(int action) {
 		super.firePropertyChange(action);
 	}
 
@@ -854,26 +744,20 @@
 	 *
 	 * @generated
 	 */
-	public void setSelectionToViewer(Collection<?> collection)
-	{
+	public void setSelectionToViewer(Collection<?> collection) {
 		final Collection<?> theSelection = collection;
 		// Make sure it's okay.
 		//
-		if (theSelection != null && !theSelection.isEmpty())
-		{
-			final Runnable runnable =
-				new Runnable()
-				{
-					public void run()
-					{
-						// Try to select the items in the current content viewer of the editor.
-						//
-						if (currentViewer != null)
-						{
-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-						}
+		if (theSelection != null && !theSelection.isEmpty()) {
+			final Runnable runnable = new Runnable() {
+				public void run() {
+					// Try to select the items in the current content viewer of the editor.
+					//
+					if (currentViewer != null) {
+						currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
 					}
-				};
+				}
+			};
 			getSite().getShell().getDisplay().asyncExec(runnable);
 		}
 	}
@@ -887,8 +771,7 @@
 	 *
 	 * @generated
 	 */
-	public EditingDomain getEditingDomain()
-	{
+	public EditingDomain getEditingDomain() {
 		return editingDomain;
 	}
 
@@ -898,16 +781,14 @@
 	 *
 	 * @generated
 	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider
-	{
+	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
 		 *
 		 * @generated
 		 */
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory)
-		{
+		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
 			super(adapterFactory);
 		}
 
@@ -918,8 +799,7 @@
 		 * @generated
 		 */
 		@Override
-		public Object[] getElements(Object object)
-		{
+		public Object[] getElements(Object object) {
 			final Object parent = super.getParent(object);
 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
 		}
@@ -931,8 +811,7 @@
 		 * @generated
 		 */
 		@Override
-		public Object[] getChildren(Object object)
-		{
+		public Object[] getChildren(Object object) {
 			final Object parent = super.getParent(object);
 			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
 		}
@@ -944,8 +823,7 @@
 		 * @generated
 		 */
 		@Override
-		public boolean hasChildren(Object object)
-		{
+		public boolean hasChildren(Object object) {
 			final Object parent = super.getParent(object);
 			return parent != null;
 		}
@@ -957,8 +835,7 @@
 		 * @generated
 		 */
 		@Override
-		public Object getParent(Object object)
-		{
+		public Object getParent(Object object) {
 			return null;
 		}
 	}
@@ -969,12 +846,9 @@
 	 *
 	 * @generated
 	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane)
-	{
-		if (currentViewerPane != viewerPane)
-		{
-			if (currentViewerPane != null)
-			{
+	public void setCurrentViewerPane(ViewerPane viewerPane) {
+		if (currentViewerPane != viewerPane) {
+			if (currentViewerPane != null) {
 				currentViewerPane.showFocus(false);
 			}
 			currentViewerPane = viewerPane;
@@ -990,39 +864,31 @@
 	 *
 	 * @generated
 	 */
-	public void setCurrentViewer(Viewer viewer)
-	{
+	public void setCurrentViewer(Viewer viewer) {
 		// If it is changing...
 		//
-		if (currentViewer != viewer)
-		{
-			if (selectionChangedListener == null)
-			{
+		if (currentViewer != viewer) {
+			if (selectionChangedListener == null) {
 				// Create the listener on demand.
 				//
-				selectionChangedListener =
-					new ISelectionChangedListener()
-					{
-						// This just notifies those things that are affected by the section.
-						//
-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent)
-						{
-							setSelection(selectionChangedEvent.getSelection());
-						}
-					};
+				selectionChangedListener = new ISelectionChangedListener() {
+					// This just notifies those things that are affected by the section.
+					//
+					public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
+						setSelection(selectionChangedEvent.getSelection());
+					}
+				};
 			}
 
 			// Stop listening to the old one.
 			//
-			if (currentViewer != null)
-			{
+			if (currentViewer != null) {
 				currentViewer.removeSelectionChangedListener(selectionChangedListener);
 			}
 
 			// Start listening to the new one.
 			//
-			if (viewer != null)
-			{
+			if (viewer != null) {
 				viewer.addSelectionChangedListener(selectionChangedListener);
 			}
 
@@ -1043,8 +909,7 @@
 	 *
 	 * @generated
 	 */
-	public Viewer getViewer()
-	{
+	public Viewer getViewer() {
 		return currentViewer;
 	}
 
@@ -1055,8 +920,7 @@
 	 *
 	 * @generated
 	 */
-	protected void createContextMenuFor(StructuredViewer viewer)
-	{
+	protected void createContextMenuFor(StructuredViewer viewer) {
 		final MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
 		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
 		contextMenu.setRemoveAllWhenShown(true);
@@ -1078,25 +942,21 @@
 	 *
 	 * @generated
 	 */
-	public void createModel()
-	{
+	public void createModel() {
 		final URI resourceURI = EditUIUtil.getURI(getEditorInput());
 		Exception exception = null;
 		Resource resource = null;
-		try
-		{
+		try {
 			// Load the resource through the editing domain.
 			//
 			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		} catch (final Exception e)
-		{
+		} catch (final Exception e) {
 			exception = e;
 			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
 		}
 
 		final Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK)
-		{
+		if (diagnostic.getSeverity() != Diagnostic.OK) {
 			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
 		}
 		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
@@ -1110,28 +970,21 @@
 	 *
 	 * @generated
 	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception)
-	{
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty())
-		{
-			final BasicDiagnostic basicDiagnostic =
-				new BasicDiagnostic
-				(Diagnostic.ERROR, "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
-					0,
-					getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
-					new Object[] { exception == null ? (Object) resource : exception });
+	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
+		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
+			final BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR,
+				"org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
+				0,
+				getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
+				new Object[] { exception == null ? (Object) resource : exception });
 			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
 			return basicDiagnostic;
-		}
-		else if (exception != null)
-		{
+		} else if (exception != null) {
 			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.emf.emfstore.fuzzy.emf.editor", //$NON-NLS-1$
 				0,
 				getString("_UI_CreateModelError_message", resource.getURI()), //$NON-NLS-1$
 				new Object[] { exception });
-		}
-		else
-		{
+		} else {
 			return Diagnostic.OK_INSTANCE;
 		}
 	}
@@ -1144,37 +997,31 @@
 	 * @generated
 	 */
 	@Override
-	public void createPages()
-	{
+	public void createPages() {
 		// Creates the model from the editor input
 		//
 		createModel();
 
 		// Only creates the other pages if there is something that can be edited
 		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty())
-		{
+		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
 			// Create a page for the selection tree view.
 			//
 			{
-				final ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigEditor.this)
-					{
-						@Override
-						public Viewer createViewer(Composite composite)
-						{
-							final Tree tree = new Tree(composite, SWT.MULTI);
-							final TreeViewer newTreeViewer = new TreeViewer(tree);
-							return newTreeViewer;
-						}
+				final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+					@Override
+					public Viewer createViewer(Composite composite) {
+						final Tree tree = new Tree(composite, SWT.MULTI);
+						final TreeViewer newTreeViewer = new TreeViewer(tree);
+						return newTreeViewer;
+					}
 
-						@Override
-						public void requestActivation()
-						{
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
+					@Override
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
 				viewerPane.createControl(getContainer());
 
 				selectionViewer = (TreeViewer) viewerPane.getViewer();
@@ -1196,24 +1043,20 @@
 			// Create a page for the parent tree view.
 			//
 			{
-				final ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigEditor.this)
-					{
-						@Override
-						public Viewer createViewer(Composite composite)
-						{
-							final Tree tree = new Tree(composite, SWT.MULTI);
-							final TreeViewer newTreeViewer = new TreeViewer(tree);
-							return newTreeViewer;
-						}
+				final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+					@Override
+					public Viewer createViewer(Composite composite) {
+						final Tree tree = new Tree(composite, SWT.MULTI);
+						final TreeViewer newTreeViewer = new TreeViewer(tree);
+						return newTreeViewer;
+					}
 
-						@Override
-						public void requestActivation()
-						{
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
+					@Override
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
 				viewerPane.createControl(getContainer());
 
 				parentViewer = (TreeViewer) viewerPane.getViewer();
@@ -1229,22 +1072,18 @@
 			// This is the page for the list viewer
 			//
 			{
-				final ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigEditor.this)
-					{
-						@Override
-						public Viewer createViewer(Composite composite)
-						{
-							return new ListViewer(composite);
-						}
+				final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+					@Override
+					public Viewer createViewer(Composite composite) {
+						return new ListViewer(composite);
+					}
 
-						@Override
-						public void requestActivation()
-						{
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
+					@Override
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
 				viewerPane.createControl(getContainer());
 				listViewer = (ListViewer) viewerPane.getViewer();
 				listViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
@@ -1258,22 +1097,18 @@
 			// This is the page for the tree viewer
 			//
 			{
-				final ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigEditor.this)
-					{
-						@Override
-						public Viewer createViewer(Composite composite)
-						{
-							return new TreeViewer(composite);
-						}
+				final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+					@Override
+					public Viewer createViewer(Composite composite) {
+						return new TreeViewer(composite);
+					}
 
-						@Override
-						public void requestActivation()
-						{
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
+					@Override
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
 				viewerPane.createControl(getContainer());
 				treeViewer = (TreeViewer) viewerPane.getViewer();
 				treeViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
@@ -1289,22 +1124,18 @@
 			// This is the page for the table viewer.
 			//
 			{
-				final ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigEditor.this)
-					{
-						@Override
-						public Viewer createViewer(Composite composite)
-						{
-							return new TableViewer(composite);
-						}
+				final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+					@Override
+					public Viewer createViewer(Composite composite) {
+						return new TableViewer(composite);
+					}
 
-						@Override
-						public void requestActivation()
-						{
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
+					@Override
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
 				viewerPane.createControl(getContainer());
 				tableViewer = (TableViewer) viewerPane.getViewer();
 
@@ -1336,22 +1167,18 @@
 			// This is the page for the table tree viewer.
 			//
 			{
-				final ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), ConfigEditor.this)
-					{
-						@Override
-						public Viewer createViewer(Composite composite)
-						{
-							return new TreeViewer(composite);
-						}
+				final ViewerPane viewerPane = new ViewerPane(getSite().getPage(), ConfigEditor.this) {
+					@Override
+					public Viewer createViewer(Composite composite) {
+						return new TreeViewer(composite);
+					}
 
-						@Override
-						public void requestActivation()
-						{
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
+					@Override
+					public void requestActivation() {
+						super.requestActivation();
+						setCurrentViewerPane(this);
+					}
+				};
 				viewerPane.createControl(getContainer());
 
 				treeViewerWithColumns = (TreeViewer) viewerPane.getViewer();
@@ -1380,44 +1207,34 @@
 				setPageText(pageIndex, getString("_UI_TreeWithColumnsPage_label")); //$NON-NLS-1$
 			}
 
-			getSite().getShell().getDisplay().asyncExec
-				(new Runnable()
-				{
-					public void run()
-					{
-						setActivePage(0);
-					}
-				});
+			getSite().getShell().getDisplay().asyncExec(new Runnable() {
+				public void run() {
+					setActivePage(0);
+				}
+			});
 		}
 
 		// Ensures that this editor will only display the page's tab
 		// area if there are more than one page
 		//
-		getContainer().addControlListener
-			(new ControlAdapter()
-			{
-				boolean guard = false;
+		getContainer().addControlListener(new ControlAdapter() {
+			boolean guard = false;
 
-				@Override
-				public void controlResized(ControlEvent event)
-				{
-					if (!guard)
-					{
-						guard = true;
-						hideTabs();
-						guard = false;
-					}
+			@Override
+			public void controlResized(ControlEvent event) {
+				if (!guard) {
+					guard = true;
+					hideTabs();
+					guard = false;
 				}
-			});
+			}
+		});
 
-		getSite().getShell().getDisplay().asyncExec
-			(new Runnable()
-			{
-				public void run()
-				{
-					updateProblemIndication();
-				}
-			});
+		getSite().getShell().getDisplay().asyncExec(new Runnable() {
+			public void run() {
+				updateProblemIndication();
+			}
+		});
 	}
 
 	/**
@@ -1428,13 +1245,10 @@
 	 *
 	 * @generated
 	 */
-	protected void hideTabs()
-	{
-		if (getPageCount() <= 1)
-		{
+	protected void hideTabs() {
+		if (getPageCount() <= 1) {
 			setPageText(0, ""); //$NON-NLS-1$
-			if (getContainer() instanceof CTabFolder)
-			{
+			if (getContainer() instanceof CTabFolder) {
 				((CTabFolder) getContainer()).setTabHeight(1);
 				final Point point = getContainer().getSize();
 				getContainer().setSize(point.x, point.y + 6);
@@ -1450,13 +1264,10 @@
 	 *
 	 * @generated
 	 */
-	protected void showTabs()
-	{
-		if (getPageCount() > 1)
-		{
+	protected void showTabs() {
+		if (getPageCount() > 1) {
 			setPageText(0, getString("_UI_SelectionPage_label")); //$NON-NLS-1$
-			if (getContainer() instanceof CTabFolder)
-			{
+			if (getContainer() instanceof CTabFolder) {
 				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
 				final Point point = getContainer().getSize();
 				getContainer().setSize(point.x, point.y - 6);
@@ -1472,12 +1283,10 @@
 	 * @generated
 	 */
 	@Override
-	protected void pageChange(int pageIndex)
-	{
+	protected void pageChange(int pageIndex) {
 		super.pageChange(pageIndex);
 
-		if (contentOutlinePage != null)
-		{
+		if (contentOutlinePage != null) {
 			handleContentOutlineSelection(contentOutlinePage.getSelection());
 		}
 	}
@@ -1490,22 +1299,14 @@
 	 * @generated
 	 */
 	@Override
-	public Object getAdapter(@SuppressWarnings("rawtypes") Class key)
-	{
-		if (key.equals(IContentOutlinePage.class))
-		{
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class key) {
+		if (key.equals(IContentOutlinePage.class)) {
 			return showOutlineView() ? getContentOutlinePage() : null;
-		}
-		else if (key.equals(IPropertySheetPage.class))
-		{
+		} else if (key.equals(IPropertySheetPage.class)) {
 			return getPropertySheetPage();
-		}
-		else if (key.equals(IGotoMarker.class))
-		{
+		} else if (key.equals(IGotoMarker.class)) {
 			return this;
-		}
-		else
-		{
+		} else {
 			return super.getAdapter(key);
 		}
 	}
@@ -1517,17 +1318,13 @@
 	 *
 	 * @generated
 	 */
-	public IContentOutlinePage getContentOutlinePage()
-	{
-		if (contentOutlinePage == null)
-		{
+	public IContentOutlinePage getContentOutlinePage() {
+		if (contentOutlinePage == null) {
 			// The content outline is just a tree.
 			//
-			class MyContentOutlinePage extends ContentOutlinePage
-			{
+			class MyContentOutlinePage extends ContentOutlinePage {
 				@Override
-				public void createControl(Composite parent)
-				{
+				public void createControl(Composite parent) {
 					super.createControl(parent);
 					contentOutlineViewer = getTreeViewer();
 					contentOutlineViewer.addSelectionChangedListener(this);
@@ -1542,8 +1339,7 @@
 					//
 					createContextMenuFor(contentOutlineViewer);
 
-					if (!editingDomain.getResourceSet().getResources().isEmpty())
-					{
+					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
 						// Select the root object in the view.
 						//
 						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet()
@@ -1553,15 +1349,13 @@
 
 				@Override
 				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager,
-					IStatusLineManager statusLineManager)
-				{
+					IStatusLineManager statusLineManager) {
 					super.makeContributions(menuManager, toolBarManager, statusLineManager);
 					contentOutlineStatusLineManager = statusLineManager;
 				}
 
 				@Override
-				public void setActionBars(IActionBars actionBars)
-				{
+				public void setActionBars(IActionBars actionBars) {
 					super.setActionBars(actionBars);
 					getActionBarContributor().shareGlobalActions(this, actionBars);
 				}
@@ -1571,16 +1365,13 @@
 
 			// Listen to selection so that we can handle it is a special way.
 			//
-			contentOutlinePage.addSelectionChangedListener
-				(new ISelectionChangedListener()
-				{
-					// This ensures that we handle selections correctly.
-					//
-					public void selectionChanged(SelectionChangedEvent event)
-					{
-						handleContentOutlineSelection(event.getSelection());
-					}
-				});
+			contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
+				// This ensures that we handle selections correctly.
+				//
+				public void selectionChanged(SelectionChangedEvent event) {
+					handleContentOutlineSelection(event.getSelection());
+				}
+			});
 		}
 
 		return contentOutlinePage;
@@ -1593,25 +1384,20 @@
 	 *
 	 * @generated
 	 */
-	public IPropertySheetPage getPropertySheetPage()
-	{
-		final PropertySheetPage propertySheetPage =
-			new ExtendedPropertySheetPage(editingDomain)
-			{
-				@Override
-				public void setSelectionToViewer(List<?> selection)
-				{
-					ConfigEditor.this.setSelectionToViewer(selection);
-					ConfigEditor.this.setFocus();
-				}
+	public IPropertySheetPage getPropertySheetPage() {
+		final PropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
+			@Override
+			public void setSelectionToViewer(List<?> selection) {
+				ConfigEditor.this.setSelectionToViewer(selection);
+				ConfigEditor.this.setFocus();
+			}
 
-				@Override
-				public void setActionBars(IActionBars actionBars)
-				{
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			};
+			@Override
+			public void setActionBars(IActionBars actionBars) {
+				super.setActionBars(actionBars);
+				getActionBarContributor().shareGlobalActions(this, actionBars);
+			}
+		};
 		propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
 		propertySheetPages.add(propertySheetPage);
 
@@ -1625,38 +1411,30 @@
 	 *
 	 * @generated
 	 */
-	public void handleContentOutlineSelection(ISelection selection)
-	{
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection)
-		{
+	public void handleContentOutlineSelection(ISelection selection) {
+		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
 			final Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
-			if (selectedElements.hasNext())
-			{
+			if (selectedElements.hasNext()) {
 				// Get the first selected element.
 				//
 				final Object selectedElement = selectedElements.next();
 
 				// If it's the selection viewer, then we want it to select the same selection as this selection.
 				//
-				if (currentViewerPane.getViewer() == selectionViewer)
-				{
+				if (currentViewerPane.getViewer() == selectionViewer) {
 					final ArrayList<Object> selectionList = new ArrayList<Object>();
 					selectionList.add(selectedElement);
-					while (selectedElements.hasNext())
-					{
+					while (selectedElements.hasNext()) {
 						selectionList.add(selectedElements.next());
 					}
 
 					// Set the selection to the widget.
 					//
 					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				}
-				else
-				{
+				} else {
 					// Set the input to the widget.
 					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement)
-					{
+					if (currentViewerPane.getViewer().getInput() != selectedElement) {
 						currentViewerPane.getViewer().setInput(selectedElement);
 						currentViewerPane.setTitle(selectedElement);
 					}
@@ -1673,8 +1451,7 @@
 	 * @generated
 	 */
 	@Override
-	public boolean isDirty()
-	{
+	public boolean isDirty() {
 		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
 	}
 
@@ -1686,8 +1463,7 @@
 	 * @generated
 	 */
 	@Override
-	public void doSave(IProgressMonitor progressMonitor)
-	{
+	public void doSave(IProgressMonitor progressMonitor) {
 		// Save only resources that have actually changed.
 		//
 		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
@@ -1695,44 +1471,34 @@
 
 		// Do the work within an operation because this is a long running activity that modifies the workbench.
 		//
-		final WorkspaceModifyOperation operation =
-			new WorkspaceModifyOperation()
-			{
-				// This is the method that gets invoked when the operation runs.
+		final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+			// This is the method that gets invoked when the operation runs.
+			//
+			@Override
+			public void execute(IProgressMonitor monitor) {
+				// Save the resources to the file system.
 				//
-				@Override
-				public void execute(IProgressMonitor monitor)
-				{
-					// Save the resources to the file system.
-					//
-					boolean first = true;
-					for (final Resource resource : editingDomain.getResourceSet().getResources())
-					{
-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
-							&& !editingDomain.isReadOnly(resource))
-						{
-							try
-							{
-								final long timeStamp = resource.getTimeStamp();
-								resource.save(saveOptions);
-								if (resource.getTimeStamp() != timeStamp)
-								{
-									savedResources.add(resource);
-								}
+				boolean first = true;
+				for (final Resource resource : editingDomain.getResourceSet().getResources()) {
+					if ((first || !resource.getContents().isEmpty() || isPersisted(resource))
+						&& !editingDomain.isReadOnly(resource)) {
+						try {
+							final long timeStamp = resource.getTimeStamp();
+							resource.save(saveOptions);
+							if (resource.getTimeStamp() != timeStamp) {
+								savedResources.add(resource);
 							}
-							catch (final Exception exception)
-							{
-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-							}
-							first = false;
+						} catch (final Exception exception) {
+							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
 						}
+						first = false;
 					}
 				}
-			};
+			}
+		};
 
 		updateProblemIndication = false;
-		try
-		{
+		try {
 			// This runs the options, and shows progress.
 			//
 			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
@@ -1741,8 +1507,7 @@
 			//
 			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
 			firePropertyChange(IEditorPart.PROP_DIRTY);
-		} catch (final Exception exception)
-		{
+		} catch (final Exception exception) {
 			// Something went wrong that shouldn't.
 			//
 			ConfigEditorPlugin.INSTANCE.log(exception);
@@ -1759,20 +1524,16 @@
 	 *
 	 * @generated
 	 */
-	protected boolean isPersisted(Resource resource)
-	{
+	protected boolean isPersisted(Resource resource) {
 		boolean result = false;
-		try
-		{
+		try {
 			final InputStream stream = editingDomain.getResourceSet().getURIConverter()
 				.createInputStream(resource.getURI());
-			if (stream != null)
-			{
+			if (stream != null) {
 				result = true;
 				stream.close();
 			}
-		} catch (final IOException e)
-		{
+		} catch (final IOException e) {
 			// Ignore
 		}
 		return result;
@@ -1786,8 +1547,7 @@
 	 * @generated
 	 */
 	@Override
-	public boolean isSaveAsAllowed()
-	{
+	public boolean isSaveAsAllowed() {
 		return true;
 	}
 
@@ -1799,16 +1559,13 @@
 	 * @generated
 	 */
 	@Override
-	public void doSaveAs()
-	{
+	public void doSaveAs() {
 		final SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
 		saveAsDialog.open();
 		final IPath path = saveAsDialog.getResult();
-		if (path != null)
-		{
+		if (path != null) {
 			final IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null)
-			{
+			if (file != null) {
 				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
 			}
 		}
@@ -1820,15 +1577,12 @@
 	 *
 	 * @generated
 	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput)
-	{
+	protected void doSaveAs(URI uri, IEditorInput editorInput) {
 		editingDomain.getResourceSet().getResources().get(0).setURI(uri);
 		setInputWithNotify(editorInput);
 		setPartName(editorInput.getName());
-		final IProgressMonitor progressMonitor =
-			getActionBars().getStatusLineManager() != null ?
-				getActionBars().getStatusLineManager().getProgressMonitor() :
-				new NullProgressMonitor();
+		final IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null
+			? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
 		doSave(progressMonitor);
 	}
 
@@ -1838,11 +1592,9 @@
 	 *
 	 * @generated
 	 */
-	public void gotoMarker(IMarker marker)
-	{
+	public void gotoMarker(IMarker marker) {
 		final List<?> targetObjects = markerHelper.getTargetObjects(editingDomain, marker);
-		if (!targetObjects.isEmpty())
-		{
+		if (!targetObjects.isEmpty()) {
 			setSelectionToViewer(targetObjects);
 		}
 	}
@@ -1855,8 +1607,7 @@
 	 * @generated
 	 */
 	@Override
-	public void init(IEditorSite site, IEditorInput editorInput)
-	{
+	public void init(IEditorSite site, IEditorInput editorInput) {
 		setSite(site);
 		setInputWithNotify(editorInput);
 		setPartName(editorInput.getName());
@@ -1873,14 +1624,10 @@
 	 * @generated
 	 */
 	@Override
-	public void setFocus()
-	{
-		if (currentViewerPane != null)
-		{
+	public void setFocus() {
+		if (currentViewerPane != null) {
 			currentViewerPane.setFocus();
-		}
-		else
-		{
+		} else {
 			getControl(getActivePage()).setFocus();
 		}
 	}
@@ -1892,8 +1639,7 @@
 	 *
 	 * @generated
 	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener)
-	{
+	public void addSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.add(listener);
 	}
 
@@ -1904,8 +1650,7 @@
 	 *
 	 * @generated
 	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener)
-	{
+	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
 		selectionChangedListeners.remove(listener);
 	}
 
@@ -1916,8 +1661,7 @@
 	 *
 	 * @generated
 	 */
-	public ISelection getSelection()
-	{
+	public ISelection getSelection() {
 		return editorSelection;
 	}
 
@@ -1929,12 +1673,10 @@
 	 *
 	 * @generated
 	 */
-	public void setSelection(ISelection selection)
-	{
+	public void setSelection(ISelection selection) {
 		editorSelection = selection;
 
-		for (final ISelectionChangedListener listener : selectionChangedListeners)
-		{
+		for (final ISelectionChangedListener listener : selectionChangedListeners) {
 			listener.selectionChanged(new SelectionChangedEvent(this, selection));
 		}
 		setStatusLineManager(selection);
@@ -1946,18 +1688,14 @@
 	 *
 	 * @generated
 	 */
-	public void setStatusLineManager(ISelection selection)
-	{
-		final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
+	public void setStatusLineManager(ISelection selection) {
+		final IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer
+			? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
 
-		if (statusLineManager != null)
-		{
-			if (selection instanceof IStructuredSelection)
-			{
+		if (statusLineManager != null) {
+			if (selection instanceof IStructuredSelection) {
 				final Collection<?> collection = ((IStructuredSelection) selection).toList();
-				switch (collection.size())
-				{
+				switch (collection.size()) {
 				case 0: {
 					statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
 					break;
@@ -1974,9 +1712,7 @@
 					break;
 				}
 				}
-			}
-			else
-			{
+			} else {
 				statusLineManager.setMessage(""); //$NON-NLS-1$
 			}
 		}
@@ -1989,8 +1725,7 @@
 	 *
 	 * @generated
 	 */
-	private static String getString(String key)
-	{
+	private static String getString(String key) {
 		return ConfigEditorPlugin.INSTANCE.getString(key);
 	}
 
@@ -2001,8 +1736,7 @@
 	 *
 	 * @generated
 	 */
-	private static String getString(String key, Object s1)
-	{
+	private static String getString(String key, Object s1) {
 		return ConfigEditorPlugin.INSTANCE.getString(key, new Object[] { s1 });
 	}
 
@@ -2014,8 +1748,7 @@
 	 *
 	 * @generated
 	 */
-	public void menuAboutToShow(IMenuManager menuManager)
-	{
+	public void menuAboutToShow(IMenuManager menuManager) {
 		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
 	}
 
@@ -2025,8 +1758,7 @@
 	 *
 	 * @generated
 	 */
-	public EditingDomainActionBarContributor getActionBarContributor()
-	{
+	public EditingDomainActionBarContributor getActionBarContributor() {
 		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
 	}
 
@@ -2036,8 +1768,7 @@
 	 *
 	 * @generated
 	 */
-	public IActionBars getActionBars()
-	{
+	public IActionBars getActionBars() {
 		return getActionBarContributor().getActionBars();
 	}
 
@@ -2047,8 +1778,7 @@
 	 *
 	 * @generated
 	 */
-	public AdapterFactory getAdapterFactory()
-	{
+	public AdapterFactory getAdapterFactory() {
 		return adapterFactory;
 	}
 
@@ -2059,8 +1789,7 @@
 	 * @generated
 	 */
 	@Override
-	public void dispose()
-	{
+	public void dispose() {
 		updateProblemIndication = false;
 
 		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
@@ -2069,18 +1798,15 @@
 
 		adapterFactory.dispose();
 
-		if (getActionBarContributor().getActiveEditor() == this)
-		{
+		if (getActionBarContributor().getActiveEditor() == this) {
 			getActionBarContributor().setActiveEditor(null);
 		}
 
-		for (final PropertySheetPage propertySheetPage : propertySheetPages)
-		{
+		for (final PropertySheetPage propertySheetPage : propertySheetPages) {
 			propertySheetPage.dispose();
 		}
 
-		if (contentOutlinePage != null)
-		{
+		if (contentOutlinePage != null) {
 			contentOutlinePage.dispose();
 		}
 
@@ -2094,8 +1820,7 @@
 	 *
 	 * @generated
 	 */
-	protected boolean showOutlineView()
-	{
+	protected boolean showOutlineView() {
 		return true;
 	}
 }
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java
index a22d80e..03ce814 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigEditorPlugin.java
@@ -21,8 +21,7 @@
  *
  * @generated
  */
-public final class ConfigEditorPlugin extends EMFPlugin
-{
+public final class ConfigEditorPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
@@ -48,11 +47,9 @@
 	 *
 	 * @generated
 	 */
-	public ConfigEditorPlugin()
-	{
-		super(new ResourceLocator[]
-		{
-			});
+	public ConfigEditorPlugin() {
+		super(new ResourceLocator[] {
+		});
 	}
 
 	/**
@@ -64,8 +61,7 @@
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getPluginResourceLocator()
-	{
+	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
 
@@ -77,8 +73,7 @@
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	public static Implementation getPlugin()
-	{
+	public static Implementation getPlugin() {
 		return plugin;
 	}
 
@@ -89,8 +84,7 @@
 	 *
 	 * @generated
 	 */
-	public static class Implementation extends EclipseUIPlugin
-	{
+	public static class Implementation extends EclipseUIPlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
@@ -98,8 +92,7 @@
 		 *
 		 * @generated
 		 */
-		public Implementation()
-		{
+		public Implementation() {
 			super();
 
 			// Remember the static instance.
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java
index 445276b..ef9cd1f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf.editor/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/presentation/ConfigModelWizard.java
@@ -73,8 +73,7 @@
  *
  * @generated
  */
-public class ConfigModelWizard extends Wizard implements INewWizard
-{
+public class ConfigModelWizard extends Wizard implements INewWizard {
 	/**
 	 * The supported extensions for created files.
 	 * <!-- begin-user-doc -->
@@ -82,8 +81,8 @@
 	 *
 	 * @generated
 	 */
-	public static final List<String> FILE_EXTENSIONS =
-		Collections.unmodifiableList(Arrays.asList(ConfigEditorPlugin.INSTANCE.getString(
+	public static final List<String> FILE_EXTENSIONS = Collections
+		.unmodifiableList(Arrays.asList(ConfigEditorPlugin.INSTANCE.getString(
 			"_UI_ConfigEditorFilenameExtensions").split("\\s*,\\s*"))); //$NON-NLS-1$ //$NON-NLS-2$
 
 	/**
@@ -93,8 +92,8 @@
 	 *
 	 * @generated
 	 */
-	public static final String FORMATTED_FILE_EXTENSIONS =
-		ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+	public static final String FORMATTED_FILE_EXTENSIONS = ConfigEditorPlugin.INSTANCE
+		.getString("_UI_ConfigEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 
 	/**
 	 * This caches an instance of the model package.
@@ -166,8 +165,7 @@
 	 *
 	 * @generated
 	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection)
-	{
+	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		this.workbench = workbench;
 		this.selection = selection;
 		setWindowTitle(ConfigEditorPlugin.INSTANCE.getString("_UI_Wizard_label")); //$NON-NLS-1$
@@ -182,18 +180,13 @@
 	 *
 	 * @generated
 	 */
-	protected Collection<String> getInitialObjectNames()
-	{
-		if (initialObjectNames == null)
-		{
+	protected Collection<String> getInitialObjectNames() {
+		if (initialObjectNames == null) {
 			initialObjectNames = new ArrayList<String>();
-			for (final EClassifier eClassifier : configPackage.getEClassifiers())
-			{
-				if (eClassifier instanceof EClass)
-				{
+			for (final EClassifier eClassifier : configPackage.getEClassifiers()) {
+				if (eClassifier instanceof EClass) {
 					final EClass eClass = (EClass) eClassifier;
-					if (!eClass.isAbstract())
-					{
+					if (!eClass.isAbstract()) {
 						initialObjectNames.add(eClass.getName());
 					}
 				}
@@ -210,8 +203,7 @@
 	 *
 	 * @generated
 	 */
-	protected EObject createInitialModel()
-	{
+	protected EObject createInitialModel() {
 		final EClass eClass = (EClass) configPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
 		final EObject rootObject = configFactory.create(eClass);
 		return rootObject;
@@ -225,60 +217,49 @@
 	 * @generated
 	 */
 	@Override
-	public boolean performFinish()
-	{
-		try
-		{
+	public boolean performFinish() {
+		try {
 			// Remember the file.
 			//
 			final IFile modelFile = getModelFile();
 
 			// Do the work within an operation.
 			//
-			final WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation()
-				{
-					@Override
-					protected void execute(IProgressMonitor progressMonitor)
-					{
-						try
-						{
-							// Create a resource set
-							//
-							final ResourceSet resourceSet = new ResourceSetImpl();
+			final WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+				@Override
+				protected void execute(IProgressMonitor progressMonitor) {
+					try {
+						// Create a resource set
+						//
+						final ResourceSet resourceSet = new ResourceSetImpl();
 
-							// Get the URI of the model file.
-							//
-							final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
+						// Get the URI of the model file.
+						//
+						final URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
 
-							// Create a resource for this file.
-							//
-							final Resource resource = resourceSet.createResource(fileURI);
+						// Create a resource for this file.
+						//
+						final Resource resource = resourceSet.createResource(fileURI);
 
-							// Add the initial model object to the contents.
-							//
-							final EObject rootObject = createInitialModel();
-							if (rootObject != null)
-							{
-								resource.getContents().add(rootObject);
-							}
-
-							// Save the contents of the resource to the file system.
-							//
-							final Map<Object, Object> options = new HashMap<Object, Object>();
-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
-							resource.save(options);
+						// Add the initial model object to the contents.
+						//
+						final EObject rootObject = createInitialModel();
+						if (rootObject != null) {
+							resource.getContents().add(rootObject);
 						}
-						catch (final Exception exception)
-						{
-							ConfigEditorPlugin.INSTANCE.log(exception);
-						}
-						finally
-						{
-							progressMonitor.done();
-						}
+
+						// Save the contents of the resource to the file system.
+						//
+						final Map<Object, Object> options = new HashMap<Object, Object>();
+						options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
+						resource.save(options);
+					} catch (final Exception exception) {
+						ConfigEditorPlugin.INSTANCE.log(exception);
+					} finally {
+						progressMonitor.done();
 					}
-				};
+				}
+			};
 
 			getContainer().run(false, false, operation);
 
@@ -287,36 +268,28 @@
 			final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
 			final IWorkbenchPage page = workbenchWindow.getActivePage();
 			final IWorkbenchPart activePart = page.getActivePart();
-			if (activePart instanceof ISetSelectionTarget)
-			{
+			if (activePart instanceof ISetSelectionTarget) {
 				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec
-					(new Runnable()
-					{
-						public void run()
-						{
-							((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-						}
-					});
+				getShell().getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						((ISetSelectionTarget) activePart).selectReveal(targetSelection);
+					}
+				});
 			}
 
 			// Open an editor on the new file.
 			//
-			try
-			{
-				page.openEditor
-					(new FileEditorInput(modelFile),
-						workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-			} catch (final PartInitException exception)
-			{
+			try {
+				page.openEditor(new FileEditorInput(modelFile),
+					workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
+			} catch (final PartInitException exception) {
 				MessageDialog.openError(workbenchWindow.getShell(),
 					ConfigEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage()); //$NON-NLS-1$
 				return false;
 			}
 
 			return true;
-		} catch (final Exception exception)
-		{
+		} catch (final Exception exception) {
 			ConfigEditorPlugin.INSTANCE.log(exception);
 			return false;
 		}
@@ -329,8 +302,7 @@
 	 *
 	 * @generated
 	 */
-	public class ConfigModelWizardNewFileCreationPage extends WizardNewFileCreationPage
-	{
+	public class ConfigModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
 		/**
 		 * Pass in the selection.
 		 * <!-- begin-user-doc -->
@@ -338,8 +310,7 @@
 		 *
 		 * @generated
 		 */
-		public ConfigModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection)
-		{
+		public ConfigModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
 			super(pageId, selection);
 		}
 
@@ -351,14 +322,12 @@
 		 * @generated
 		 */
 		@Override
-		protected boolean validatePage()
-		{
-			if (super.validatePage())
-			{
+		protected boolean validatePage() {
+			if (super.validatePage()) {
 				final String extension = new Path(getFileName()).getFileExtension();
-				if (extension == null || !FILE_EXTENSIONS.contains(extension))
-				{
-					final String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension"; //$NON-NLS-1$ //$NON-NLS-2$
+				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
+					final String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" //$NON-NLS-1$
+						: "_WARN_FilenameExtension"; //$NON-NLS-1$
 					setErrorMessage(ConfigEditorPlugin.INSTANCE.getString(key,
 						new Object[] { FORMATTED_FILE_EXTENSIONS }));
 					return false;
@@ -374,8 +343,7 @@
 		 *
 		 * @generated
 		 */
-		public IFile getModelFile()
-		{
+		public IFile getModelFile() {
 			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
 		}
 	}
@@ -387,8 +355,7 @@
 	 *
 	 * @generated
 	 */
-	public class ConfigModelWizardInitialObjectCreationPage extends WizardPage
-	{
+	public class ConfigModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
@@ -399,7 +366,7 @@
 
 		/**
 		 * @generated
-		 *            <!-- begin-user-doc -->
+		 * 			<!-- begin-user-doc -->
 		 *            <!-- end-user-doc -->
 		 */
 		protected List<String> encodings;
@@ -419,8 +386,7 @@
 		 *
 		 * @generated
 		 */
-		public ConfigModelWizardInitialObjectCreationPage(String pageId)
-		{
+		public ConfigModelWizardInitialObjectCreationPage(String pageId) {
 			super(pageId);
 		}
 
@@ -430,8 +396,7 @@
 		 *
 		 * @generated
 		 */
-		public void createControl(Composite parent)
-		{
+		public void createControl(Composite parent) {
 			final Composite composite = new Composite(parent, SWT.NONE);
 			{
 				final GridLayout layout = new GridLayout();
@@ -463,13 +428,11 @@
 				initialObjectField.setLayoutData(data);
 			}
 
-			for (final String objectName : getInitialObjectNames())
-			{
+			for (final String objectName : getInitialObjectNames()) {
 				initialObjectField.add(getLabel(objectName));
 			}
 
-			if (initialObjectField.getItemCount() == 1)
-			{
+			if (initialObjectField.getItemCount() == 1) {
 				initialObjectField.select(0);
 			}
 			initialObjectField.addModifyListener(validator);
@@ -490,8 +453,7 @@
 				encodingField.setLayoutData(data);
 			}
 
-			for (final String encoding : getEncodings())
-			{
+			for (final String encoding : getEncodings()) {
 				encodingField.add(encoding);
 			}
 
@@ -508,14 +470,11 @@
 		 *
 		 * @generated
 		 */
-		protected ModifyListener validator =
-			new ModifyListener()
-			{
-				public void modifyText(ModifyEvent e)
-				{
-					setPageComplete(validatePage());
-				}
-			};
+		protected ModifyListener validator = new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				setPageComplete(validatePage());
+			}
+		};
 
 		/**
 		 * <!-- begin-user-doc -->
@@ -523,8 +482,7 @@
 		 *
 		 * @generated
 		 */
-		protected boolean validatePage()
-		{
+		protected boolean validatePage() {
 			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
 		}
 
@@ -535,18 +493,13 @@
 		 * @generated
 		 */
 		@Override
-		public void setVisible(boolean visible)
-		{
+		public void setVisible(boolean visible) {
 			super.setVisible(visible);
-			if (visible)
-			{
-				if (initialObjectField.getItemCount() == 1)
-				{
+			if (visible) {
+				if (initialObjectField.getItemCount() == 1) {
 					initialObjectField.clearSelection();
 					encodingField.setFocus();
-				}
-				else
-				{
+				} else {
 					encodingField.clearSelection();
 					initialObjectField.setFocus();
 				}
@@ -559,14 +512,11 @@
 		 *
 		 * @generated
 		 */
-		public String getInitialObjectName()
-		{
+		public String getInitialObjectName() {
 			final String label = initialObjectField.getText();
 
-			for (final String name : getInitialObjectNames())
-			{
-				if (getLabel(name).equals(label))
-				{
+			for (final String name : getInitialObjectNames()) {
+				if (getLabel(name).equals(label)) {
 					return name;
 				}
 			}
@@ -579,8 +529,7 @@
 		 *
 		 * @generated
 		 */
-		public String getEncoding()
-		{
+		public String getEncoding() {
 			return encodingField.getText();
 		}
 
@@ -591,13 +540,10 @@
 		 *
 		 * @generated
 		 */
-		protected String getLabel(String typeName)
-		{
-			try
-			{
+		protected String getLabel(String typeName) {
+			try {
 				return ConfigEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type"); //$NON-NLS-1$ //$NON-NLS-2$
-			} catch (final MissingResourceException mre)
-			{
+			} catch (final MissingResourceException mre) {
 				ConfigEditorPlugin.INSTANCE.log(mre);
 			}
 			return typeName;
@@ -609,10 +555,8 @@
 		 *
 		 * @generated
 		 */
-		protected Collection<String> getEncodings()
-		{
-			if (encodings == null)
-			{
+		protected Collection<String> getEncodings() {
+			if (encodings == null) {
 				encodings = new ArrayList<String>();
 				for (final StringTokenizer stringTokenizer = new StringTokenizer(
 					ConfigEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens();) //$NON-NLS-1$
@@ -632,38 +576,34 @@
 	 * @generated
 	 */
 	@Override
-	public void addPages()
-	{
+	public void addPages() {
 		// Create a page, set the title, and the initial model file name.
 		//
 		newFileCreationPage = new ConfigModelWizardNewFileCreationPage("Whatever", selection); //$NON-NLS-1$
 		newFileCreationPage.setTitle(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigModelWizard_label")); //$NON-NLS-1$
 		newFileCreationPage.setDescription(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigModelWizard_description")); //$NON-NLS-1$
 		newFileCreationPage
-			.setFileName(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0)); //$NON-NLS-1$ //$NON-NLS-2$
+			.setFileName(ConfigEditorPlugin.INSTANCE.getString("_UI_ConfigEditorFilenameDefaultBase") + "." //$NON-NLS-1$ //$NON-NLS-2$
+				+ FILE_EXTENSIONS.get(0));
 		addPage(newFileCreationPage);
 
 		// Try and get the resource selection to determine a current directory for the file dialog.
 		//
-		if (selection != null && !selection.isEmpty())
-		{
+		if (selection != null && !selection.isEmpty()) {
 			// Get the resource...
 			//
 			final Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource)
-			{
+			if (selectedElement instanceof IResource) {
 				// Get the resource parent, if its a file.
 				//
 				IResource selectedResource = (IResource) selectedElement;
-				if (selectedResource.getType() == IResource.FILE)
-				{
+				if (selectedResource.getType() == IResource.FILE) {
 					selectedResource = selectedResource.getParent();
 				}
 
 				// This gives us a directory...
 				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject)
-				{
+				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
 					// Set this for the container.
 					//
 					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
@@ -674,8 +614,7 @@
 						.getString("_UI_ConfigEditorFilenameDefaultBase"); //$NON-NLS-1$
 					final String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
 					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension; //$NON-NLS-1$
-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i)
-					{
+					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
 						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension; //$NON-NLS-1$
 					}
 					newFileCreationPage.setFileName(modelFilename);
@@ -696,8 +635,7 @@
 	 *
 	 * @generated
 	 */
-	public IFile getModelFile()
-	{
+	public IFile getModelFile() {
 		return newFileCreationPage.getModelFile();
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
index 5b02e99..e39cafa 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEMFDataProvider.java
@@ -183,8 +183,7 @@
 				resource.load(null);
 			}
 
-			final TestConfig internalConfig =
-				ESTestConfigImpl.class.cast(config).toInternalAPI();
+			final TestConfig internalConfig = ESTestConfigImpl.class.cast(config).toInternalAPI();
 
 			if (!FuzzyUtil.containsConfig(resource, internalConfig)) {
 				resource.getContents().add(internalConfig);
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java
index ebb7349..21a6d4f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESEObjectHasExternalReference.java
@@ -38,8 +38,8 @@
 	 * @see com.google.common.base.Predicate#apply(java.lang.Object)
 	 */
 	public boolean apply(EObject root) {
-		final Map<EObject, Collection<Setting>> externalCrossReferences =
-			EcoreUtil.ExternalCrossReferencer.find(Collections.singleton(root));
+		final Map<EObject, Collection<Setting>> externalCrossReferences = EcoreUtil.ExternalCrossReferencer
+			.find(Collections.singleton(root));
 
 		final Resource rootResource = root.eResource();
 		final Set<EObject> externalEObjects = externalCrossReferences.keySet();
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
index 640fafa..4fd771a 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/ESXMIResourceDataProvider.java
@@ -199,8 +199,7 @@
 				resource.load(null);
 			}
 
-			final TestConfig internalConfig =
-				ESTestConfigImpl.class.cast(config).toInternalAPI();
+			final TestConfig internalConfig = ESTestConfigImpl.class.cast(config).toInternalAPI();
 
 			if (!FuzzyUtil.containsConfig(resource, internalConfig)) {
 				resource.getContents().add(internalConfig);
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java
index d3d5efc..1613c34 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/internal/diff/HudsonTestRunProvider.java
@@ -106,7 +106,8 @@
 
 		firstBuildNumber = getLastValidBuildNumber(
 			Integer.parseInt(getFirstElementValue(jobUrl + LAST_BUILD
-				+ "/api/xml?tree=number")), jobUrl); //$NON-NLS-1$
+				+ "/api/xml?tree=number")), //$NON-NLS-1$
+			jobUrl);
 		secondBuildNumber = getLastValidBuildNumber(firstBuildNumber - 1,
 			jobUrl);
 	}
@@ -175,7 +176,8 @@
 		} catch (final DocumentException ex) {
 			throw new DocumentException(
 				MessageFormat.format(
-					Messages.HudsonTestRunProvider_ReadFailed, url), ex);
+					Messages.HudsonTestRunProvider_ReadFailed, url),
+				ex);
 		}
 		final List<Element> elements = doc.getRootElement().elements();
 		if (elements.size() == 0) {
@@ -254,7 +256,8 @@
 			+ "/"; //$NON-NLS-1$
 		final int lastValidNumber = getLastValidBuildNumber(
 			Integer.parseInt(getFirstElementValue(diffJobUrl + LAST_BUILD
-				+ "/api/xml?tree=number")), diffJobUrl); //$NON-NLS-1$
+				+ "/api/xml?tree=number")), //$NON-NLS-1$
+			diffJobUrl);
 		return FuzzyUtil.createResource(diffJobUrl + lastValidNumber + ARTIFACT
 			+ FuzzyUtil.FUZZY_FOLDER + "diff" + FuzzyUtil.FILE_SUFFIX); //$NON-NLS-1$
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
index 94c261b..5bd5788 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/fuzzy/emf/junit/ESFuzzyDataProvider.java
@@ -20,7 +20,8 @@
 import org.junit.runners.model.TestClass;
 
 /**
- * A Data Provider for the JUnit Runner: {@link org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner ESFuzzyRunner}.<br>
+ * A Data Provider for the JUnit Runner: {@link org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner ESFuzzyRunner}.
+ * <br>
  * <br>
  * An implementation of it must have a zero-parameter constructor.
  *
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
index ffe33a6..19d702b 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/EMFRunListener.java
@@ -15,8 +15,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import junit.framework.AssertionFailedError;
-
 import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigFactory;
@@ -27,6 +25,8 @@
 import org.junit.runner.notification.Failure;
 import org.junit.runner.notification.RunListener;
 
+import junit.framework.AssertionFailedError;
+
 /**
  * {@link RunListener} used to create the report of a run of the {@link ESEMFDataProvider}.
  *
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java
index f5b4bc3..d64d772 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/FuzzyUtil.java
@@ -219,7 +219,8 @@
 			} catch (final IOException e) {
 				throw new RuntimeException(
 					MessageFormat.format(Messages.FuzzyUtil_LoadPropertiesFailed,
-						file.getAbsolutePath()), e);
+						file.getAbsolutePath()),
+					e);
 			}
 		}
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java
index deedebe..d2dc907 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigFactory.java
@@ -17,7 +17,7 @@
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage
  * @generated
  */
@@ -26,47 +26,47 @@
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	ConfigFactory eINSTANCE = org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigFactoryImpl.init();
 
 	/**
-	 * Returns a new object of class '<em>ESFuzzyTest Config</em>'.
+	 * Returns a new object of class '<em>Test Config</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>ESFuzzyTest Config</em>'.
+	 * 
+	 * @return a new object of class '<em>Test Config</em>'.
 	 * @generated
 	 */
 	TestConfig createTestConfig();
 
 	/**
-	 * Returns a new object of class '<em>ESFuzzyTest Run</em>'.
+	 * Returns a new object of class '<em>Test Run</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>ESFuzzyTest Run</em>'.
+	 * 
+	 * @return a new object of class '<em>Test Run</em>'.
 	 * @generated
 	 */
 	TestRun createTestRun();
 
 	/**
-	 * Returns a new object of class '<em>ESFuzzyTest Result</em>'.
+	 * Returns a new object of class '<em>Test Result</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>ESFuzzyTest Result</em>'.
+	 * 
+	 * @return a new object of class '<em>Test Result</em>'.
 	 * @generated
 	 */
 	TestResult createTestResult();
 
 	/**
-	 * Returns a new object of class '<em>ESFuzzyTest Diff</em>'.
+	 * Returns a new object of class '<em>Test Diff</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return a new object of class '<em>ESFuzzyTest Diff</em>'.
+	 * 
+	 * @return a new object of class '<em>Test Diff</em>'.
 	 * @generated
 	 */
 	TestDiff createTestDiff();
@@ -75,7 +75,7 @@
 	 * Returns a new object of class '<em>Diff Report</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Diff Report</em>'.
 	 * @generated
 	 */
@@ -85,7 +85,7 @@
 	 * Returns a new object of class '<em>Root</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Root</em>'.
 	 * @generated
 	 */
@@ -95,7 +95,7 @@
 	 * Returns a new object of class '<em>Mutator Config</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return a new object of class '<em>Mutator Config</em>'.
 	 * @generated
 	 */
@@ -105,7 +105,7 @@
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java
index dfe96f6..151cd44 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/ConfigPackage.java
@@ -26,7 +26,7 @@
  * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigFactory
  * @model kind="package"
  * @generated
@@ -36,7 +36,7 @@
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNAME = "config"; //$NON-NLS-1$
@@ -45,7 +45,7 @@
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://org/eclipse/emf/emfstore/fuzzy/emf/config"; //$NON-NLS-1$
@@ -54,7 +54,7 @@
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "org.eclipse.emf.emfstore.fuzzy.emf.config"; //$NON-NLS-1$
@@ -63,17 +63,17 @@
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	ConfigPackage eINSTANCE = org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl.init();
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl
-	 * <em>ESFuzzyTest Config</em>}' class.
+	 * <em>Test Config</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestConfig()
 	 * @generated
@@ -84,7 +84,7 @@
 	 * The feature id for the '<em><b>Seed</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -94,17 +94,17 @@
 	 * The feature id for the '<em><b>Count</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEST_CONFIG__COUNT = 1;
 
 	/**
-	 * The feature id for the '<em><b>ESFuzzyTest Class</b></em>' attribute.
+	 * The feature id for the '<em><b>Test Class</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -114,7 +114,7 @@
 	 * The feature id for the '<em><b>Id</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -124,17 +124,17 @@
 	 * The feature id for the '<em><b>Mutator Config</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEST_CONFIG__MUTATOR_CONFIG = 4;
 
 	/**
-	 * The number of structural features of the '<em>ESFuzzyTest Config</em>' class.
+	 * The number of structural features of the '<em>Test Config</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -142,10 +142,10 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl
-	 * <em>ESFuzzyTest Run</em>}' class.
+	 * <em>Test Run</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestRun()
 	 * @generated
@@ -156,7 +156,7 @@
 	 * The feature id for the '<em><b>Config</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -166,7 +166,7 @@
 	 * The feature id for the '<em><b>Time</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -176,17 +176,17 @@
 	 * The feature id for the '<em><b>Results</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEST_RUN__RESULTS = 2;
 
 	/**
-	 * The number of structural features of the '<em>ESFuzzyTest Run</em>' class.
+	 * The number of structural features of the '<em>Test Run</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -194,10 +194,10 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl
-	 * <em>ESFuzzyTest Result</em>}' class.
+	 * <em>Test Result</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestResult()
 	 * @generated
@@ -208,17 +208,17 @@
 	 * The feature id for the '<em><b>Seed Count</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEST_RESULT__SEED_COUNT = 0;
 
 	/**
-	 * The feature id for the '<em><b>ESFuzzyTest Name</b></em>' attribute.
+	 * The feature id for the '<em><b>Test Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -228,7 +228,7 @@
 	 * The feature id for the '<em><b>Error</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -238,7 +238,7 @@
 	 * The feature id for the '<em><b>Failure</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -248,17 +248,17 @@
 	 * The feature id for the '<em><b>Execution Time</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEST_RESULT__EXECUTION_TIME = 4;
 
 	/**
-	 * The number of structural features of the '<em>ESFuzzyTest Result</em>' class.
+	 * The number of structural features of the '<em>Test Result</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -266,10 +266,10 @@
 
 	/**
 	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl
-	 * <em>ESFuzzyTest Diff</em>}' class.
+	 * <em>Test Diff</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestDiff()
 	 * @generated
@@ -280,7 +280,7 @@
 	 * The feature id for the '<em><b>Last Update</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -290,7 +290,7 @@
 	 * The feature id for the '<em><b>Config</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -300,7 +300,7 @@
 	 * The feature id for the '<em><b>Old Result</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -310,17 +310,17 @@
 	 * The feature id for the '<em><b>New Result</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int TEST_DIFF__NEW_RESULT = 3;
 
 	/**
-	 * The number of structural features of the '<em>ESFuzzyTest Diff</em>' class.
+	 * The number of structural features of the '<em>Test Diff</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -331,7 +331,7 @@
 	 * <em>Diff Report</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.DiffReportImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getDiffReport()
 	 * @generated
@@ -342,7 +342,7 @@
 	 * The feature id for the '<em><b>Diffs</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -352,18 +352,18 @@
 	 * The number of structural features of the '<em>Diff Report</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int DIFF_REPORT_FEATURE_COUNT = 1;
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl
-	 * <em>Root</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl <em>Root</em>
+	 * }' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getRoot()
 	 * @generated
@@ -374,7 +374,7 @@
 	 * The feature id for the '<em><b>Elements</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -384,7 +384,7 @@
 	 * The number of structural features of the '<em>Root</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -395,7 +395,7 @@
 	 * <em>Mutator Config</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getMutatorConfig()
 	 * @generated
@@ -406,7 +406,7 @@
 	 * The feature id for the '<em><b>Root EClass</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -416,7 +416,7 @@
 	 * The feature id for the '<em><b>Min Objects Count</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -426,7 +426,7 @@
 	 * The feature id for the '<em><b>Ignore And Log</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -436,17 +436,17 @@
 	 * The feature id for the '<em><b>Do Not Generate Root</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT = 3;
 
 	/**
-	 * The feature id for the '<em><b>Use Ecore ESFuzzyUtil Delete</b></em>' attribute.
+	 * The feature id for the '<em><b>Use Ecore Util Delete</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -456,7 +456,7 @@
 	 * The feature id for the '<em><b>EClasses To Ignore</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -466,7 +466,7 @@
 	 * The feature id for the '<em><b>EStructural Features To Ignore</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -476,7 +476,7 @@
 	 * The feature id for the '<em><b>EPackages</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -486,7 +486,7 @@
 	 * The feature id for the '<em><b>Max Delete Count</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -496,7 +496,7 @@
 	 * The feature id for the '<em><b>Mutation Count</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -506,7 +506,7 @@
 	 * The feature id for the '<em><b>Allow Duplicate IDs</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -516,7 +516,7 @@
 	 * The number of structural features of the '<em>Mutator Config</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -524,11 +524,11 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig
-	 * <em>ESFuzzyTest Config</em>}'.
+	 * <em>Test Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>ESFuzzyTest Config</em>'.
+	 * 
+	 * @return the meta object for class '<em>Test Config</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig
 	 * @generated
 	 */
@@ -539,7 +539,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed <em>Seed</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Seed</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed()
 	 * @see #getTestConfig()
@@ -552,7 +552,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getCount <em>Count</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Count</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getCount()
 	 * @see #getTestConfig()
@@ -562,11 +562,11 @@
 
 	/**
 	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>ESFuzzyTest Class</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>Test Class</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>ESFuzzyTest Class</em>'.
+	 * 
+	 * @return the meta object for the attribute '<em>Test Class</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass()
 	 * @see #getTestConfig()
 	 * @generated
@@ -578,7 +578,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getId <em>Id</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getId()
 	 * @see #getTestConfig()
@@ -591,7 +591,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getMutatorConfig <em>Mutator Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Mutator Config</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getMutatorConfig()
 	 * @see #getTestConfig()
@@ -601,11 +601,11 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
-	 * <em>ESFuzzyTest Run</em>}'.
+	 * <em>Test Run</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>ESFuzzyTest Run</em>'.
+	 * 
+	 * @return the meta object for class '<em>Test Run</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
 	 * @generated
 	 */
@@ -616,7 +616,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getConfig <em>Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Config</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getConfig()
 	 * @see #getTestRun()
@@ -629,7 +629,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getTime <em>Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Time</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getTime()
 	 * @see #getTestRun()
@@ -642,7 +642,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getResults <em>Results</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Results</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getResults()
 	 * @see #getTestRun()
@@ -652,11 +652,11 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult
-	 * <em>ESFuzzyTest Result</em>}'.
+	 * <em>Test Result</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>ESFuzzyTest Result</em>'.
+	 * 
+	 * @return the meta object for class '<em>Test Result</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult
 	 * @generated
 	 */
@@ -667,7 +667,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getSeedCount <em>Seed Count</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Seed Count</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getSeedCount()
 	 * @see #getTestResult()
@@ -677,11 +677,11 @@
 
 	/**
 	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>ESFuzzyTest Name</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>Test Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>ESFuzzyTest Name</em>'.
+	 * 
+	 * @return the meta object for the attribute '<em>Test Name</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName()
 	 * @see #getTestResult()
 	 * @generated
@@ -693,7 +693,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getError <em>Error</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Error</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getError()
 	 * @see #getTestResult()
@@ -706,7 +706,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getFailure <em>Failure</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Failure</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getFailure()
 	 * @see #getTestResult()
@@ -719,7 +719,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getExecutionTime <em>Execution Time</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Execution Time</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getExecutionTime()
 	 * @see #getTestResult()
@@ -729,11 +729,11 @@
 
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
-	 * <em>ESFuzzyTest Diff</em>}'.
+	 * <em>Test Diff</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for class '<em>ESFuzzyTest Diff</em>'.
+	 * 
+	 * @return the meta object for class '<em>Test Diff</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
 	 * @generated
 	 */
@@ -744,7 +744,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getLastUpdate <em>Last Update</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Last Update</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getLastUpdate()
 	 * @see #getTestDiff()
@@ -757,7 +757,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getConfig <em>Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Config</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getConfig()
 	 * @see #getTestDiff()
@@ -770,7 +770,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getOldResult <em>Old Result</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>Old Result</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getOldResult()
 	 * @see #getTestDiff()
@@ -783,7 +783,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getNewResult <em>New Result</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference '<em>New Result</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getNewResult()
 	 * @see #getTestDiff()
@@ -796,7 +796,7 @@
 	 * <em>Diff Report</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Diff Report</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport
 	 * @generated
@@ -808,7 +808,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport#getDiffs <em>Diffs</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Diffs</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport#getDiffs()
 	 * @see #getDiffReport()
@@ -821,7 +821,7 @@
 	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Root</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root
 	 * @generated
@@ -833,7 +833,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root#getElements <em>Elements</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the containment reference list '<em>Elements</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root#getElements()
 	 * @see #getRoot()
@@ -846,7 +846,7 @@
 	 * <em>Mutator Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for class '<em>Mutator Config</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig
 	 * @generated
@@ -858,7 +858,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getRootEClass <em>Root EClass</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference '<em>Root EClass</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getRootEClass()
 	 * @see #getMutatorConfig()
@@ -872,7 +872,7 @@
 	 * <em>Min Objects Count</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Min Objects Count</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount()
 	 * @see #getMutatorConfig()
@@ -885,7 +885,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isIgnoreAndLog <em>Ignore And Log</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Ignore And Log</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isIgnoreAndLog()
 	 * @see #getMutatorConfig()
@@ -899,7 +899,7 @@
 	 * <em>Do Not Generate Root</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Do Not Generate Root</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isDoNotGenerateRoot()
 	 * @see #getMutatorConfig()
@@ -910,11 +910,11 @@
 	/**
 	 * Returns the meta object for the attribute '
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete
-	 * <em>Use Ecore ESFuzzyUtil Delete</em>}'.
+	 * <em>Use Ecore Util Delete</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the meta object for the attribute '<em>Use Ecore ESFuzzyUtil Delete</em>'.
+	 * 
+	 * @return the meta object for the attribute '<em>Use Ecore Util Delete</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete()
 	 * @see #getMutatorConfig()
 	 * @generated
@@ -927,7 +927,7 @@
 	 * <em>EClasses To Ignore</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>EClasses To Ignore</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEClassesToIgnore()
 	 * @see #getMutatorConfig()
@@ -941,7 +941,7 @@
 	 * <em>EStructural Features To Ignore</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>EStructural Features To Ignore</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEStructuralFeaturesToIgnore()
 	 * @see #getMutatorConfig()
@@ -954,7 +954,7 @@
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEPackages <em>EPackages</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the reference list '<em>EPackages</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEPackages()
 	 * @see #getMutatorConfig()
@@ -968,7 +968,7 @@
 	 * <em>Max Delete Count</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Max Delete Count</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMaxDeleteCount()
 	 * @see #getMutatorConfig()
@@ -982,7 +982,7 @@
 	 * '.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Mutation Count</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMutationCount()
 	 * @see #getMutatorConfig()
@@ -996,7 +996,7 @@
 	 * <em>Allow Duplicate IDs</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the meta object for the attribute '<em>Allow Duplicate IDs</em>'.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isAllowDuplicateIDs()
 	 * @see #getMutatorConfig()
@@ -1008,7 +1008,7 @@
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1024,17 +1024,16 @@
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	interface Literals {
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl <em>ESFuzzyTest Config</em>}'
-		 * class.
+		 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl <em>Test Config</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestConfig()
 		 * @generated
@@ -1045,7 +1044,7 @@
 		 * The meta object literal for the '<em><b>Seed</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_CONFIG__SEED = eINSTANCE.getTestConfig_Seed();
@@ -1054,16 +1053,16 @@
 		 * The meta object literal for the '<em><b>Count</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_CONFIG__COUNT = eINSTANCE.getTestConfig_Count();
 
 		/**
-		 * The meta object literal for the '<em><b>ESFuzzyTest Class</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Test Class</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_CONFIG__TEST_CLASS = eINSTANCE.getTestConfig_TestClass();
@@ -1072,7 +1071,7 @@
 		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_CONFIG__ID = eINSTANCE.getTestConfig_Id();
@@ -1081,17 +1080,17 @@
 		 * The meta object literal for the '<em><b>Mutator Config</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TEST_CONFIG__MUTATOR_CONFIG = eINSTANCE.getTestConfig_MutatorConfig();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl
-		 * <em>ESFuzzyTest Run</em>}' class.
+		 * <em>Test Run</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestRun()
 		 * @generated
@@ -1102,7 +1101,7 @@
 		 * The meta object literal for the '<em><b>Config</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TEST_RUN__CONFIG = eINSTANCE.getTestRun_Config();
@@ -1111,7 +1110,7 @@
 		 * The meta object literal for the '<em><b>Time</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_RUN__TIME = eINSTANCE.getTestRun_Time();
@@ -1120,18 +1119,17 @@
 		 * The meta object literal for the '<em><b>Results</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TEST_RUN__RESULTS = eINSTANCE.getTestRun_Results();
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl <em>ESFuzzyTest Result</em>}'
-		 * class.
+		 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl <em>Test Result</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestResult()
 		 * @generated
@@ -1142,16 +1140,16 @@
 		 * The meta object literal for the '<em><b>Seed Count</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_RESULT__SEED_COUNT = eINSTANCE.getTestResult_SeedCount();
 
 		/**
-		 * The meta object literal for the '<em><b>ESFuzzyTest Name</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Test Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_RESULT__TEST_NAME = eINSTANCE.getTestResult_TestName();
@@ -1160,7 +1158,7 @@
 		 * The meta object literal for the '<em><b>Error</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_RESULT__ERROR = eINSTANCE.getTestResult_Error();
@@ -1169,7 +1167,7 @@
 		 * The meta object literal for the '<em><b>Failure</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_RESULT__FAILURE = eINSTANCE.getTestResult_Failure();
@@ -1178,17 +1176,17 @@
 		 * The meta object literal for the '<em><b>Execution Time</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_RESULT__EXECUTION_TIME = eINSTANCE.getTestResult_ExecutionTime();
 
 		/**
 		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl
-		 * <em>ESFuzzyTest Diff</em>}' class.
+		 * <em>Test Diff</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getTestDiff()
 		 * @generated
@@ -1199,7 +1197,7 @@
 		 * The meta object literal for the '<em><b>Last Update</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute TEST_DIFF__LAST_UPDATE = eINSTANCE.getTestDiff_LastUpdate();
@@ -1208,7 +1206,7 @@
 		 * The meta object literal for the '<em><b>Config</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TEST_DIFF__CONFIG = eINSTANCE.getTestDiff_Config();
@@ -1217,7 +1215,7 @@
 		 * The meta object literal for the '<em><b>Old Result</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TEST_DIFF__OLD_RESULT = eINSTANCE.getTestDiff_OldResult();
@@ -1226,7 +1224,7 @@
 		 * The meta object literal for the '<em><b>New Result</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference TEST_DIFF__NEW_RESULT = eINSTANCE.getTestDiff_NewResult();
@@ -1236,7 +1234,7 @@
 		 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.DiffReportImpl <em>Diff Report</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.DiffReportImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getDiffReport()
 		 * @generated
@@ -1247,7 +1245,7 @@
 		 * The meta object literal for the '<em><b>Diffs</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference DIFF_REPORT__DIFFS = eINSTANCE.getDiffReport_Diffs();
@@ -1257,7 +1255,7 @@
 		 * <em>Root</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getRoot()
 		 * @generated
@@ -1268,7 +1266,7 @@
 		 * The meta object literal for the '<em><b>Elements</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference ROOT__ELEMENTS = eINSTANCE.getRoot_Elements();
@@ -1279,7 +1277,7 @@
 		 * class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl
 		 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.ConfigPackageImpl#getMutatorConfig()
 		 * @generated
@@ -1290,7 +1288,7 @@
 		 * The meta object literal for the '<em><b>Root EClass</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference MUTATOR_CONFIG__ROOT_ECLASS = eINSTANCE.getMutatorConfig_RootEClass();
@@ -1299,7 +1297,7 @@
 		 * The meta object literal for the '<em><b>Min Objects Count</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__MIN_OBJECTS_COUNT = eINSTANCE.getMutatorConfig_MinObjectsCount();
@@ -1308,7 +1306,7 @@
 		 * The meta object literal for the '<em><b>Ignore And Log</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__IGNORE_AND_LOG = eINSTANCE.getMutatorConfig_IgnoreAndLog();
@@ -1317,16 +1315,16 @@
 		 * The meta object literal for the '<em><b>Do Not Generate Root</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__DO_NOT_GENERATE_ROOT = eINSTANCE.getMutatorConfig_DoNotGenerateRoot();
 
 		/**
-		 * The meta object literal for the '<em><b>Use Ecore ESFuzzyUtil Delete</b></em>' attribute feature.
+		 * The meta object literal for the '<em><b>Use Ecore Util Delete</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__USE_ECORE_UTIL_DELETE = eINSTANCE.getMutatorConfig_UseEcoreUtilDelete();
@@ -1335,7 +1333,7 @@
 		 * The meta object literal for the '<em><b>EClasses To Ignore</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference MUTATOR_CONFIG__ECLASSES_TO_IGNORE = eINSTANCE.getMutatorConfig_EClassesToIgnore();
@@ -1344,7 +1342,7 @@
 		 * The meta object literal for the '<em><b>EStructural Features To Ignore</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference MUTATOR_CONFIG__ESTRUCTURAL_FEATURES_TO_IGNORE = eINSTANCE
@@ -1354,7 +1352,7 @@
 		 * The meta object literal for the '<em><b>EPackages</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EReference MUTATOR_CONFIG__EPACKAGES = eINSTANCE.getMutatorConfig_EPackages();
@@ -1363,7 +1361,7 @@
 		 * The meta object literal for the '<em><b>Max Delete Count</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__MAX_DELETE_COUNT = eINSTANCE.getMutatorConfig_MaxDeleteCount();
@@ -1372,7 +1370,7 @@
 		 * The meta object literal for the '<em><b>Mutation Count</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__MUTATION_COUNT = eINSTANCE.getMutatorConfig_MutationCount();
@@ -1381,7 +1379,7 @@
 		 * The meta object literal for the '<em><b>Allow Duplicate IDs</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
 		EAttribute MUTATOR_CONFIG__ALLOW_DUPLICATE_IDS = eINSTANCE.getMutatorConfig_AllowDuplicateIDs();
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java
index 15dd666..1e5cc3f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/DiffReport.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport#getDiffs <em>Diffs</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getDiffReport()
  * @model
@@ -39,7 +39,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Diffs</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getDiffReport_Diffs()
 	 * @model containment="true"
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java
index 04e3a08..69a8d38 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/MutatorConfig.java
@@ -27,31 +27,31 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getRootEClass <em>Root EClass
- *          </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount <em>Min
- *          Objects Count</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isIgnoreAndLog <em>Ignore And
- *          Log</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isDoNotGenerateRoot <em>Do Not
- *          Generate Root</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete <em>Use
- *          Ecore ESFuzzyUtil Delete</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEClassesToIgnore <em>EClasses
- *          To Ignore</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getRootEClass
+ *          <em>Root EClass</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount
+ *          <em>Min Objects Count</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isIgnoreAndLog
+ *          <em>Ignore And Log</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isDoNotGenerateRoot
+ *          <em>Do Not Generate Root</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete
+ *          <em>Use Ecore Util Delete</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEClassesToIgnore
+ *          <em>EClasses To Ignore</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEStructuralFeaturesToIgnore
  *          <em>EStructural Features To Ignore</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getEPackages <em>EPackages</em>}
  *          </li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMaxDeleteCount <em>Max Delete
- *          Count</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMutationCount <em>Mutation
- *          Count</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isAllowDuplicateIDs <em>Allow
- *          Duplicate IDs</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMaxDeleteCount
+ *          <em>Max Delete Count</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMutationCount
+ *          <em>Mutation Count</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isAllowDuplicateIDs
+ *          <em>Allow Duplicate IDs</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig()
  * @model
@@ -66,7 +66,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Root EClass</em>' reference.
 	 * @see #setRootEClass(EClass)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_RootEClass()
@@ -80,7 +80,7 @@
 	 * <em>Root EClass</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Root EClass</em>' reference.
 	 * @see #getRootEClass()
 	 * @generated
@@ -96,7 +96,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Min Objects Count</em>' attribute.
 	 * @see #setMinObjectsCount(int)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_MinObjectsCount()
@@ -106,12 +106,11 @@
 	int getMinObjectsCount();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#getMinObjectsCount
 	 * <em>Min Objects Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Min Objects Count</em>' attribute.
 	 * @see #getMinObjectsCount()
 	 * @generated
@@ -127,7 +126,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Ignore And Log</em>' attribute.
 	 * @see #setIgnoreAndLog(boolean)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_IgnoreAndLog()
@@ -141,7 +140,7 @@
 	 * <em>Ignore And Log</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Ignore And Log</em>' attribute.
 	 * @see #isIgnoreAndLog()
 	 * @generated
@@ -157,7 +156,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Do Not Generate Root</em>' attribute.
 	 * @see #setDoNotGenerateRoot(boolean)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_DoNotGenerateRoot()
@@ -172,7 +171,7 @@
 	 * <em>Do Not Generate Root</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Do Not Generate Root</em>' attribute.
 	 * @see #isDoNotGenerateRoot()
 	 * @generated
@@ -180,7 +179,7 @@
 	void setDoNotGenerateRoot(boolean value);
 
 	/**
-	 * Returns the value of the '<em><b>Use Ecore ESFuzzyUtil Delete</b></em>' attribute.
+	 * Returns the value of the '<em><b>Use Ecore Util Delete</b></em>' attribute.
 	 * The default value is <code>"false"</code>.
 	 * <!-- begin-user-doc -->
 	 * <p>
@@ -188,8 +187,8 @@
 	 * of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>Use Ecore ESFuzzyUtil Delete</em>' attribute.
+	 * 
+	 * @return the value of the '<em>Use Ecore Util Delete</em>' attribute.
 	 * @see #setUseEcoreUtilDelete(boolean)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_UseEcoreUtilDelete()
 	 * @model default="false"
@@ -200,11 +199,11 @@
 	/**
 	 * Sets the value of the '
 	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig#isUseEcoreUtilDelete
-	 * <em>Use Ecore ESFuzzyUtil Delete</em>}' attribute.
+	 * <em>Use Ecore Util Delete</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value the new value of the '<em>Use Ecore ESFuzzyUtil Delete</em>' attribute.
+	 * 
+	 * @param value the new value of the '<em>Use Ecore Util Delete</em>' attribute.
 	 * @see #isUseEcoreUtilDelete()
 	 * @generated
 	 */
@@ -219,7 +218,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>EClasses To Ignore</em>' reference list.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_EClassesToIgnore()
 	 * @model
@@ -236,7 +235,7 @@
 	 * be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>EStructural Features To Ignore</em>' reference list.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_EStructuralFeaturesToIgnore()
 	 * @model
@@ -253,7 +252,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>EPackages</em>' reference list.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_EPackages()
 	 * @model
@@ -269,7 +268,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Max Delete Count</em>' attribute.
 	 * @see #setMaxDeleteCount(Integer)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_MaxDeleteCount()
@@ -283,7 +282,7 @@
 	 * <em>Max Delete Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Max Delete Count</em>' attribute.
 	 * @see #getMaxDeleteCount()
 	 * @generated
@@ -299,7 +298,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Mutation Count</em>' attribute.
 	 * @see #setMutationCount(int)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_MutationCount()
@@ -313,7 +312,7 @@
 	 * <em>Mutation Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Mutation Count</em>' attribute.
 	 * @see #getMutationCount()
 	 * @generated
@@ -329,7 +328,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Allow Duplicate IDs</em>' attribute.
 	 * @see #setAllowDuplicateIDs(boolean)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getMutatorConfig_AllowDuplicateIDs()
@@ -344,7 +343,7 @@
 	 * <em>Allow Duplicate IDs</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Allow Duplicate IDs</em>' attribute.
 	 * @see #isAllowDuplicateIDs()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java
index 1b73283..b7c16f7 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/Root.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root#getElements <em>Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getRoot()
  * @model
@@ -39,7 +39,7 @@
 	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Elements</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getRoot_Elements()
 	 * @model containment="true"
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java
index 649677f..6c884e4 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestConfig.java
@@ -23,16 +23,16 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed <em>Seed</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getCount <em>Count</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>ESFuzzyTest Class
- *          </em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass <em>Test Class</em>}
+ *          </li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getId <em>Id</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getMutatorConfig <em>Mutator Config
- *          </em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getMutatorConfig
+ *          <em>Mutator Config</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig()
  * @model
@@ -46,7 +46,7 @@
 	 * If the meaning of the '<em>Seed</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Seed</em>' attribute.
 	 * @see #setSeed(long)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig_Seed()
@@ -56,11 +56,11 @@
 	long getSeed();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed
-	 * <em>Seed</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getSeed <em>Seed</em>
+	 * }' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Seed</em>' attribute.
 	 * @see #getSeed()
 	 * @generated
@@ -75,7 +75,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Count</em>' attribute.
 	 * @see #setCount(int)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig_Count()
@@ -89,7 +89,7 @@
 	 * <em>Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Count</em>' attribute.
 	 * @see #getCount()
 	 * @generated
@@ -97,15 +97,15 @@
 	void setCount(int value);
 
 	/**
-	 * Returns the value of the '<em><b>ESFuzzyTest Class</b></em>' attribute.
+	 * Returns the value of the '<em><b>Test Class</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>ESFuzzyTest Class</em>' attribute isn't clear, there really should be more of a
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>ESFuzzyTest Class</em>' attribute.
+	 * 
+	 * @return the value of the '<em>Test Class</em>' attribute.
 	 * @see #setTestClass(Class)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig_TestClass()
 	 * @model
@@ -115,11 +115,11 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig#getTestClass
-	 * <em>ESFuzzyTest Class</em>}' attribute.
+	 * <em>Test Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value the new value of the '<em>ESFuzzyTest Class</em>' attribute.
+	 * 
+	 * @param value the new value of the '<em>Test Class</em>' attribute.
 	 * @see #getTestClass()
 	 * @generated
 	 */
@@ -132,7 +132,7 @@
 	 * If the meaning of the '<em>Id</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Id</em>' attribute.
 	 * @see #setId(String)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig_Id()
@@ -146,7 +146,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
@@ -161,7 +161,7 @@
 	 * a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Mutator Config</em>' containment reference.
 	 * @see #setMutatorConfig(MutatorConfig)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestConfig_MutatorConfig()
@@ -175,7 +175,7 @@
 	 * <em>Mutator Config</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Mutator Config</em>' containment reference.
 	 * @see #getMutatorConfig()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java
index 780e32c..d1a02fd 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestDiff.java
@@ -21,13 +21,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getLastUpdate <em>Last Update</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getConfig <em>Config</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getOldResult <em>Old Result</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff#getNewResult <em>New Result</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestDiff()
  * @model
@@ -42,7 +42,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Last Update</em>' attribute.
 	 * @see #setLastUpdate(Date)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestDiff_LastUpdate()
@@ -56,7 +56,7 @@
 	 * <em>Last Update</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Last Update</em>' attribute.
 	 * @see #getLastUpdate()
 	 * @generated
@@ -71,7 +71,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Config</em>' reference.
 	 * @see #setConfig(TestConfig)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestDiff_Config()
@@ -85,7 +85,7 @@
 	 * <em>Config</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Config</em>' reference.
 	 * @see #getConfig()
 	 * @generated
@@ -100,7 +100,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Old Result</em>' containment reference.
 	 * @see #setOldResult(TestResult)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestDiff_OldResult()
@@ -114,7 +114,7 @@
 	 * <em>Old Result</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Old Result</em>' containment reference.
 	 * @see #getOldResult()
 	 * @generated
@@ -129,7 +129,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>New Result</em>' containment reference.
 	 * @see #setNewResult(TestResult)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestDiff_NewResult()
@@ -143,7 +143,7 @@
 	 * <em>New Result</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>New Result</em>' containment reference.
 	 * @see #getNewResult()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java
index 00f9d38..13c9d04 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestResult.java
@@ -19,14 +19,15 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getSeedCount <em>Seed Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>ESFuzzyTest Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName <em>Test Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getError <em>Error</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getFailure <em>Failure</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getExecutionTime <em>Execution Time</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getExecutionTime <em>Execution Time</em>}
+ * </li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult()
  * @model
@@ -41,7 +42,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Seed Count</em>' attribute.
 	 * @see #setSeedCount(int)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult_SeedCount()
@@ -55,7 +56,7 @@
 	 * <em>Seed Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Seed Count</em>' attribute.
 	 * @see #getSeedCount()
 	 * @generated
@@ -63,15 +64,15 @@
 	void setSeedCount(int value);
 
 	/**
-	 * Returns the value of the '<em><b>ESFuzzyTest Name</b></em>' attribute.
+	 * Returns the value of the '<em><b>Test Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>ESFuzzyTest Name</em>' attribute isn't clear, there really should be more of a
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
-	 * @return the value of the '<em>ESFuzzyTest Name</em>' attribute.
+	 * 
+	 * @return the value of the '<em>Test Name</em>' attribute.
 	 * @see #setTestName(String)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult_TestName()
 	 * @model
@@ -81,11 +82,11 @@
 
 	/**
 	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult#getTestName
-	 * <em>ESFuzzyTest Name</em>}' attribute.
+	 * <em>Test Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
-	 * @param value the new value of the '<em>ESFuzzyTest Name</em>' attribute.
+	 * 
+	 * @param value the new value of the '<em>Test Name</em>' attribute.
 	 * @see #getTestName()
 	 * @generated
 	 */
@@ -99,7 +100,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Error</em>' attribute.
 	 * @see #setError(String)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult_Error()
@@ -113,7 +114,7 @@
 	 * <em>Error</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Error</em>' attribute.
 	 * @see #getError()
 	 * @generated
@@ -128,7 +129,7 @@
 	 * here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Failure</em>' attribute.
 	 * @see #setFailure(String)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult_Failure()
@@ -142,7 +143,7 @@
 	 * <em>Failure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Failure</em>' attribute.
 	 * @see #getFailure()
 	 * @generated
@@ -157,7 +158,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Execution Time</em>' attribute.
 	 * @see #setExecutionTime(long)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestResult_ExecutionTime()
@@ -171,7 +172,7 @@
 	 * <em>Execution Time</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Execution Time</em>' attribute.
 	 * @see #getExecutionTime()
 	 * @generated
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java
index 295d501..7d7a49f 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/TestRun.java
@@ -19,17 +19,16 @@
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>ESFuzzyTest Run</b></em>'.
  *
- * @extends APIDelegate<ESTestRunImpl>
- *          <!-- end-user-doc -->
+ * <!-- end-user-doc -->
  *
- *          <p>
- *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getConfig <em>Config</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getTime <em>Time</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getResults <em>Results</em>}</li>
- *          </ul>
- *          </p>
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getConfig <em>Config</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getTime <em>Time</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun#getResults <em>Results</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestRun()
  * @model
@@ -44,7 +43,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Config</em>' containment reference.
 	 * @see #setConfig(TestConfig)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestRun_Config()
@@ -58,7 +57,7 @@
 	 * <em>Config</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Config</em>' containment reference.
 	 * @see #getConfig()
 	 * @generated
@@ -72,7 +71,7 @@
 	 * If the meaning of the '<em>Time</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Time</em>' attribute.
 	 * @see #setTime(Date)
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestRun_Time()
@@ -86,7 +85,7 @@
 	 * attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param value the new value of the '<em>Time</em>' attribute.
 	 * @see #getTime()
 	 * @generated
@@ -102,7 +101,7 @@
 	 * description here...
 	 * </p>
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the value of the '<em>Results</em>' containment reference list.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage#getTestRun_Results()
 	 * @model containment="true"
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigFactoryImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigFactoryImpl.java
index 0c044f3..f2a6173 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigFactoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigFactoryImpl.java
@@ -29,7 +29,7 @@
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ConfigFactoryImpl extends EFactoryImpl implements ConfigFactory {
@@ -37,17 +37,17 @@
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static ConfigFactory init() {
 		try {
-			final ConfigFactory theConfigFactory = (ConfigFactory) EPackage.Registry.INSTANCE
+			ConfigFactory theConfigFactory = (ConfigFactory) EPackage.Registry.INSTANCE
 				.getEFactory(ConfigPackage.eNS_URI);
 			if (theConfigFactory != null) {
 				return theConfigFactory;
 			}
-		} catch (final Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new ConfigFactoryImpl();
@@ -57,7 +57,7 @@
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ConfigFactoryImpl() {
@@ -67,7 +67,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -95,84 +95,84 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestConfig createTestConfig() {
-		final TestConfigImpl testConfig = new TestConfigImpl();
+		TestConfigImpl testConfig = new TestConfigImpl();
 		return testConfig;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestRun createTestRun() {
-		final TestRunImpl testRun = new TestRunImpl();
+		TestRunImpl testRun = new TestRunImpl();
 		return testRun;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestResult createTestResult() {
-		final TestResultImpl testResult = new TestResultImpl();
+		TestResultImpl testResult = new TestResultImpl();
 		return testResult;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestDiff createTestDiff() {
-		final TestDiffImpl testDiff = new TestDiffImpl();
+		TestDiffImpl testDiff = new TestDiffImpl();
 		return testDiff;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public DiffReport createDiffReport() {
-		final DiffReportImpl diffReport = new DiffReportImpl();
+		DiffReportImpl diffReport = new DiffReportImpl();
 		return diffReport;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Root createRoot() {
-		final RootImpl root = new RootImpl();
+		RootImpl root = new RootImpl();
 		return root;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public MutatorConfig createMutatorConfig() {
-		final MutatorConfigImpl mutatorConfig = new MutatorConfigImpl();
+		MutatorConfigImpl mutatorConfig = new MutatorConfigImpl();
 		return mutatorConfig;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ConfigPackage getConfigPackage() {
@@ -182,7 +182,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java
index 7bad939..bb299f4 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/ConfigPackageImpl.java
@@ -30,14 +30,14 @@
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class ConfigPackageImpl extends EPackageImpl implements ConfigPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass testConfigEClass = null;
@@ -45,7 +45,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass testRunEClass = null;
@@ -53,7 +53,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass testResultEClass = null;
@@ -61,7 +61,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass testDiffEClass = null;
@@ -69,7 +69,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass diffReportEClass = null;
@@ -77,7 +77,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass rootEClass = null;
@@ -85,7 +85,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private EClass mutatorConfigEClass = null;
@@ -111,33 +111,33 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
 
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 *
+	 * 
 	 * <p>
-	 * This method is used to initialize {@link ConfigPackage#eINSTANCE} when that field is accessed. Clients should not
-	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+	 * This method is used to initialize {@link ConfigPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static ConfigPackage init() {
-		if (isInited) {
+		if (isInited)
 			return (ConfigPackage) EPackage.Registry.INSTANCE.getEPackage(ConfigPackage.eNS_URI);
-		}
 
 		// Obtain or create and register package
-		final ConfigPackageImpl theConfigPackage = (ConfigPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof ConfigPackageImpl ? EPackage.Registry.INSTANCE
-			.get(eNS_URI)
-			: new ConfigPackageImpl());
+		ConfigPackageImpl theConfigPackage = (ConfigPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof ConfigPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new ConfigPackageImpl());
 
 		isInited = true;
 
@@ -158,7 +158,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getTestConfig() {
@@ -168,7 +168,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestConfig_Seed() {
@@ -178,7 +178,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestConfig_Count() {
@@ -188,7 +188,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestConfig_TestClass() {
@@ -198,7 +198,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestConfig_Id() {
@@ -208,7 +208,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTestConfig_MutatorConfig() {
@@ -218,7 +218,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getTestRun() {
@@ -228,7 +228,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTestRun_Config() {
@@ -238,7 +238,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestRun_Time() {
@@ -248,7 +248,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTestRun_Results() {
@@ -258,7 +258,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getTestResult() {
@@ -268,7 +268,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestResult_SeedCount() {
@@ -278,7 +278,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestResult_TestName() {
@@ -288,7 +288,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestResult_Error() {
@@ -298,7 +298,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestResult_Failure() {
@@ -308,7 +308,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestResult_ExecutionTime() {
@@ -318,7 +318,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getTestDiff() {
@@ -328,7 +328,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTestDiff_LastUpdate() {
@@ -338,7 +338,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTestDiff_Config() {
@@ -348,7 +348,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTestDiff_OldResult() {
@@ -358,7 +358,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getTestDiff_NewResult() {
@@ -368,7 +368,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getDiffReport() {
@@ -378,7 +378,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getDiffReport_Diffs() {
@@ -388,7 +388,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getRoot() {
@@ -398,7 +398,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getRoot_Elements() {
@@ -408,7 +408,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EClass getMutatorConfig() {
@@ -418,7 +418,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getMutatorConfig_RootEClass() {
@@ -428,7 +428,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_MinObjectsCount() {
@@ -438,7 +438,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_IgnoreAndLog() {
@@ -448,7 +448,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_DoNotGenerateRoot() {
@@ -458,7 +458,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_UseEcoreUtilDelete() {
@@ -468,7 +468,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getMutatorConfig_EClassesToIgnore() {
@@ -478,7 +478,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getMutatorConfig_EStructuralFeaturesToIgnore() {
@@ -488,7 +488,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EReference getMutatorConfig_EPackages() {
@@ -498,7 +498,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_MaxDeleteCount() {
@@ -508,7 +508,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_MutationCount() {
@@ -518,7 +518,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMutatorConfig_AllowDuplicateIDs() {
@@ -528,7 +528,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ConfigFactory getConfigFactory() {
@@ -538,7 +538,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
@@ -548,13 +548,12 @@
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) {
+		if (isCreated)
 			return;
-		}
 		isCreated = true;
 
 		// Create classes and their features
@@ -606,7 +605,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -616,13 +615,12 @@
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) {
+		if (isInitialized)
 			return;
-		}
 		isInitialized = true;
 
 		// Initialize package
@@ -637,158 +635,107 @@
 		// Add supertypes to classes
 
 		// Initialize classes and features; add operations and parameters
-		initEClass(testConfigEClass, TestConfig.class,
-			"TestConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getTestConfig_Seed(),
-			ecorePackage.getELong(),
-			"seed", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestConfig_Count(),
-			ecorePackage.getEInt(),
-			"count", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		final EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
-		final EGenericType g2 = createEGenericType();
+		initEClass(testConfigEClass, TestConfig.class, "TestConfig", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTestConfig_Seed(), ecorePackage.getELong(), "seed", null, 0, 1, TestConfig.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestConfig_Count(), ecorePackage.getEInt(), "count", null, 0, 1, TestConfig.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		EGenericType g1 = createEGenericType(ecorePackage.getEJavaClass());
+		EGenericType g2 = createEGenericType();
 		g1.getETypeArguments().add(g2);
-		initEAttribute(
-			getTestConfig_TestClass(),
-			g1,
-			"testClass", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestConfig_Id(),
-			ecorePackage.getEString(),
-			"id", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTestConfig_MutatorConfig(),
-			getMutatorConfig(),
-			null,
-			"mutatorConfig", null, 0, 1, TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEAttribute(getTestConfig_TestClass(), g1, "testClass", null, 0, 1, TestConfig.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestConfig_Id(), ecorePackage.getEString(), "id", null, 0, 1, TestConfig.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestConfig_MutatorConfig(), this.getMutatorConfig(), null, "mutatorConfig", null, 0, 1, //$NON-NLS-1$
+			TestConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(testRunEClass, TestRun.class, "TestRun", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getTestRun_Config(),
-			getTestConfig(),
-			null,
-			"config", null, 0, 1, TestRun.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestRun_Time(),
-			ecorePackage.getEDate(),
-			"time", null, 0, 1, TestRun.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTestRun_Results(),
-			getTestResult(),
-			null,
-			"results", null, 0, -1, TestRun.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getTestRun_Config(), this.getTestConfig(), null, "config", null, 0, 1, TestRun.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestRun_Time(), ecorePackage.getEDate(), "time", null, 0, 1, TestRun.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestRun_Results(), this.getTestResult(), null, "results", null, 0, -1, TestRun.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
-		initEClass(testResultEClass, TestResult.class,
-			"TestResult", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getTestResult_SeedCount(),
-			ecorePackage.getEInt(),
-			"seedCount", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestResult_TestName(),
-			ecorePackage.getEString(),
-			"testName", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestResult_Error(),
-			ecorePackage.getEString(),
-			"error", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestResult_Failure(),
-			ecorePackage.getEString(),
-			"failure", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getTestResult_ExecutionTime(),
-			ecorePackage.getELong(),
-			"executionTime", null, 0, 1, TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(testResultEClass, TestResult.class, "TestResult", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTestResult_SeedCount(), ecorePackage.getEInt(), "seedCount", null, 0, 1, TestResult.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestResult_TestName(), ecorePackage.getEString(), "testName", null, 0, 1, TestResult.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestResult_Error(), ecorePackage.getEString(), "error", null, 0, 1, TestResult.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestResult_Failure(), ecorePackage.getEString(), "failure", null, 0, 1, TestResult.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestResult_ExecutionTime(), ecorePackage.getELong(), "executionTime", null, 0, 1, //$NON-NLS-1$
+			TestResult.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
-		initEClass(testDiffEClass, TestDiff.class, "TestDiff", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEAttribute(
-			getTestDiff_LastUpdate(),
-			ecorePackage.getEDate(),
-			"lastUpdate", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTestDiff_Config(),
-			getTestConfig(),
-			null,
-			"config", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTestDiff_OldResult(),
-			getTestResult(),
-			null,
-			"oldResult", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getTestDiff_NewResult(),
-			getTestResult(),
-			null,
-			"newResult", null, 0, 1, TestDiff.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(testDiffEClass, TestDiff.class, "TestDiff", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTestDiff_LastUpdate(), ecorePackage.getEDate(), "lastUpdate", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestDiff_Config(), this.getTestConfig(), null, "config", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getTestDiff_OldResult(), this.getTestResult(), null, "oldResult", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getTestDiff_NewResult(), this.getTestResult(), null, "newResult", null, 0, 1, TestDiff.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
-		initEClass(diffReportEClass, DiffReport.class,
-			"DiffReport", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getDiffReport_Diffs(),
-			getTestDiff(),
-			null,
-			"diffs", null, 0, -1, DiffReport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEClass(diffReportEClass, DiffReport.class, "DiffReport", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getDiffReport_Diffs(), this.getTestDiff(), null, "diffs", null, 0, -1, DiffReport.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		initEClass(rootEClass, Root.class, "Root", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getRoot_Elements(),
-			ecorePackage.getEObject(),
-			null,
-			"elements", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
+		initEReference(getRoot_Elements(), ecorePackage.getEObject(), null, "elements", null, 0, -1, Root.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
-		initEClass(mutatorConfigEClass, MutatorConfig.class,
-			"MutatorConfig", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(
-			getMutatorConfig_RootEClass(),
-			ecorePackage.getEClass(),
-			null,
-			"rootEClass", null, 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getMutatorConfig_MinObjectsCount(),
-			ecorePackage.getEInt(),
-			"minObjectsCount", "100", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-			getMutatorConfig_IgnoreAndLog(),
-			ecorePackage.getEBoolean(),
-			"ignoreAndLog", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-			getMutatorConfig_DoNotGenerateRoot(),
-			ecorePackage.getEBoolean(),
-			"doNotGenerateRoot", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-			getMutatorConfig_UseEcoreUtilDelete(),
-			ecorePackage.getEBoolean(),
-			"useEcoreUtilDelete", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEReference(
-			getMutatorConfig_EClassesToIgnore(),
-			ecorePackage.getEClass(),
-			null,
-			"eClassesToIgnore", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getMutatorConfig_EStructuralFeaturesToIgnore(),
-			ecorePackage.getEStructuralFeature(),
-			null,
-			"eStructuralFeaturesToIgnore", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEReference(
-			getMutatorConfig_EPackages(),
-			ecorePackage.getEPackage(),
-			null,
-			"ePackages", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getMutatorConfig_MaxDeleteCount(),
-			ecorePackage.getEIntegerObject(),
-			"maxDeleteCount", null, 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
-		initEAttribute(
-			getMutatorConfig_MutationCount(),
-			ecorePackage.getEInt(),
-			"mutationCount", "-1", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
-		initEAttribute(
-			getMutatorConfig_AllowDuplicateIDs(),
-			ecorePackage.getEBoolean(),
-			"allowDuplicateIDs", "false", 0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$ //$NON-NLS-2$
+		initEClass(mutatorConfigEClass, MutatorConfig.class, "MutatorConfig", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getMutatorConfig_RootEClass(), ecorePackage.getEClass(), null, "rootEClass", null, 0, 1, //$NON-NLS-1$
+			MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_MinObjectsCount(), ecorePackage.getEInt(), "minObjectsCount", "100", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+			MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_IgnoreAndLog(), ecorePackage.getEBoolean(), "ignoreAndLog", "false", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+			MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_DoNotGenerateRoot(), ecorePackage.getEBoolean(), "doNotGenerateRoot", "false", //$NON-NLS-1$//$NON-NLS-2$
+			0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_UseEcoreUtilDelete(), ecorePackage.getEBoolean(), "useEcoreUtilDelete", "false", //$NON-NLS-1$//$NON-NLS-2$
+			0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getMutatorConfig_EClassesToIgnore(), ecorePackage.getEClass(), null, "eClassesToIgnore", null, 0, //$NON-NLS-1$
+			-1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMutatorConfig_EStructuralFeaturesToIgnore(), ecorePackage.getEStructuralFeature(), null,
+			"eStructuralFeaturesToIgnore", null, 0, -1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			!IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getMutatorConfig_EPackages(), ecorePackage.getEPackage(), null, "ePackages", null, 0, -1, //$NON-NLS-1$
+			MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_MaxDeleteCount(), ecorePackage.getEIntegerObject(), "maxDeleteCount", null, 0, //$NON-NLS-1$
+			1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_MutationCount(), ecorePackage.getEInt(), "mutationCount", "-1", 0, 1, //$NON-NLS-1$//$NON-NLS-2$
+			MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEAttribute(getMutatorConfig_AllowDuplicateIDs(), ecorePackage.getEBoolean(), "allowDuplicateIDs", "false", //$NON-NLS-1$//$NON-NLS-2$
+			0, 1, MutatorConfig.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		// Create resource
 		createResource(eNS_URI);
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java
index 2cbe109..56d38fb 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/DiffReportImpl.java
@@ -29,10 +29,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.DiffReportImpl#getDiffs <em>Diffs</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -42,7 +42,7 @@
 	 * The cached value of the '{@link #getDiffs() <em>Diffs</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getDiffs()
 	 * @generated
 	 * @ordered
@@ -52,7 +52,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected DiffReportImpl() {
@@ -62,7 +62,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,7 +73,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<TestDiff> getDiffs() {
@@ -86,7 +86,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,7 +101,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -116,7 +116,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -134,7 +134,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,7 +150,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java
index 0f6b383..758bda8 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/MutatorConfigImpl.java
@@ -28,34 +28,38 @@
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Mutator Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getRootEClass <em>Root EClass
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMinObjectsCount <em>Min
- * Objects Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isIgnoreAndLog <em>Ignore And
- * Log</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isDoNotGenerateRoot <em>Do Not
- * Generate Root</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isUseEcoreUtilDelete <em>Use
- * Ecore ESFuzzyUtil Delete</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEClassesToIgnore <em>EClasses
- * To Ignore</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEStructuralFeaturesToIgnore
- * <em>EStructural Features To Ignore</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEPackages <em>EPackages</em>}
- * </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMaxDeleteCount <em>Max Delete
- * Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMutationCount <em>Mutation
- * Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isAllowDuplicateIDs <em>Allow
- * Duplicate IDs</em>}</li>
- * </ul>
- * </p>
+ * 
+ * @extends AbstractAPIDeletegateImpl<ESMutatorConfigImpl, MutatorConfig>
+ *          <!-- end-user-doc -->
+ *          <p>
+ *          The following features are implemented:
+ *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getRootEClass
+ *          <em>Root EClass</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMinObjectsCount
+ *          <em>Min Objects Count</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isIgnoreAndLog
+ *          <em>Ignore And Log</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isDoNotGenerateRoot
+ *          <em>Do Not Generate Root</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isUseEcoreUtilDelete
+ *          <em>Use Ecore Util Delete</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEClassesToIgnore
+ *          <em>EClasses To Ignore</em>}</li>
+ *          <li>
+ *          {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEStructuralFeaturesToIgnore
+ *          <em>EStructural Features To Ignore</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getEPackages
+ *          <em>EPackages</em>}
+ *          </li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMaxDeleteCount
+ *          <em>Max Delete Count</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#getMutationCount
+ *          <em>Mutation Count</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.MutatorConfigImpl#isAllowDuplicateIDs
+ *          <em>Allow Duplicate IDs</em>}</li>
+ *          </ul>
  *
  * @generated
  */
@@ -140,7 +144,7 @@
 	protected boolean doNotGenerateRoot = DO_NOT_GENERATE_ROOT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore ESFuzzyUtil Delete</em>}' attribute.
+	 * The default value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore Util Delete</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -151,7 +155,7 @@
 	protected static final boolean USE_ECORE_UTIL_DELETE_EDEFAULT = false;
 
 	/**
-	 * The cached value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore ESFuzzyUtil Delete</em>}' attribute.
+	 * The cached value of the '{@link #isUseEcoreUtilDelete() <em>Use Ecore Util Delete</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -294,8 +298,8 @@
 			rootEClass = (EClass) eResolveProxy(oldRootEClass);
 			if (rootEClass != oldRootEClass) {
 				if (eNotificationRequired()) {
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
-						ConfigPackage.MUTATOR_CONFIG__ROOT_ECLASS, oldRootEClass, rootEClass));
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigPackage.MUTATOR_CONFIG__ROOT_ECLASS,
+						oldRootEClass, rootEClass));
 				}
 			}
 		}
@@ -704,8 +708,8 @@
 		case ConfigPackage.MUTATOR_CONFIG__EPACKAGES:
 			return ePackages != null && !ePackages.isEmpty();
 		case ConfigPackage.MUTATOR_CONFIG__MAX_DELETE_COUNT:
-			return MAX_DELETE_COUNT_EDEFAULT == null ? maxDeleteCount != null : !MAX_DELETE_COUNT_EDEFAULT
-				.equals(maxDeleteCount);
+			return MAX_DELETE_COUNT_EDEFAULT == null ? maxDeleteCount != null
+				: !MAX_DELETE_COUNT_EDEFAULT.equals(maxDeleteCount);
 		case ConfigPackage.MUTATOR_CONFIG__MUTATION_COUNT:
 			return mutationCount != MUTATION_COUNT_EDEFAULT;
 		case ConfigPackage.MUTATOR_CONFIG__ALLOW_DUPLICATE_IDS:
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java
index 2cfb63b..7ccb866 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/RootImpl.java
@@ -29,10 +29,10 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.RootImpl#getElements <em>Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -41,7 +41,7 @@
 	 * The cached value of the '{@link #getElements() <em>Elements</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getElements()
 	 * @generated
 	 * @ordered
@@ -51,7 +51,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected RootImpl() {
@@ -61,7 +61,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,7 +72,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<EObject> getElements() {
@@ -85,7 +85,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -100,7 +100,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,7 +115,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -133,7 +133,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,7 +149,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java
index 57926e0..871d33e 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestConfigImpl.java
@@ -24,19 +24,23 @@
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>ESFuzzyTest Config</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getSeed <em>Seed</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getCount <em>Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getTestClass <em>ESFuzzyTest Class
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getId <em>Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getMutatorConfig <em>Mutator Config
- * </em>}</li>
- * </ul>
- * </p>
+ *
+ * @extends AbstractAPIDeletegateImpl<ESTestConfigImpl, TestConfig>
+ *          <!-- end-user-doc -->
+ *          <p>
+ *          The following features are implemented:
+ *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getSeed <em>Seed</em>}
+ *          </li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getCount <em>Count</em>}
+ *          </li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getTestClass
+ *          <em>Test Class</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getId <em>Id</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestConfigImpl#getMutatorConfig
+ *          <em>Mutator Config</em>}</li>
+ *          </ul>
  *
  * @generated
  */
@@ -87,7 +91,7 @@
 	protected int count = COUNT_EDEFAULT;
 
 	/**
-	 * The cached value of the '{@link #getTestClass() <em>ESFuzzyTest Class</em>}' attribute.
+	 * The cached value of the '{@link #getTestClass() <em>Test Class</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -289,19 +293,18 @@
 		if (newMutatorConfig != mutatorConfig) {
 			NotificationChain msgs = null;
 			if (mutatorConfig != null) {
-				msgs = ((InternalEObject) mutatorConfig).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
+				msgs = ((InternalEObject) mutatorConfig).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
 			}
 			if (newMutatorConfig != null) {
-				msgs = ((InternalEObject) newMutatorConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
+				msgs = ((InternalEObject) newMutatorConfig).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG, null, msgs);
 			}
 			msgs = basicSetMutatorConfig(newMutatorConfig, msgs);
 			if (msgs != null) {
 				msgs.dispatch();
 			}
-		}
-		else if (eNotificationRequired()) {
+		} else if (eNotificationRequired()) {
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_CONFIG__MUTATOR_CONFIG,
 				newMutatorConfig, newMutatorConfig));
 		}
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java
index d3a999d..841ac6a 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestDiffImpl.java
@@ -29,13 +29,16 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getLastUpdate <em>Last Update</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getConfig <em>Config</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getOldResult <em>Old Result</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getNewResult <em>New Result</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getLastUpdate <em>Last Update</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getConfig <em>Config</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getOldResult <em>Old Result</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestDiffImpl#getNewResult <em>New Result</em>}
+ * </li>
+ * </ul>
  *
  * @generated
  */
@@ -44,7 +47,7 @@
 	 * The default value of the '{@link #getLastUpdate() <em>Last Update</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLastUpdate()
 	 * @generated
 	 * @ordered
@@ -55,7 +58,7 @@
 	 * The cached value of the '{@link #getLastUpdate() <em>Last Update</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getLastUpdate()
 	 * @generated
 	 * @ordered
@@ -66,7 +69,7 @@
 	 * The cached value of the '{@link #getConfig() <em>Config</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getConfig()
 	 * @generated
 	 * @ordered
@@ -77,7 +80,7 @@
 	 * The cached value of the '{@link #getOldResult() <em>Old Result</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getOldResult()
 	 * @generated
 	 * @ordered
@@ -88,7 +91,7 @@
 	 * The cached value of the '{@link #getNewResult() <em>New Result</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getNewResult()
 	 * @generated
 	 * @ordered
@@ -98,7 +101,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestDiffImpl() {
@@ -108,7 +111,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,7 +122,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Date getLastUpdate() {
@@ -129,33 +132,31 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setLastUpdate(Date newLastUpdate) {
-		final Date oldLastUpdate = lastUpdate;
+		Date oldLastUpdate = lastUpdate;
 		lastUpdate = newLastUpdate;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_DIFF__LAST_UPDATE, oldLastUpdate,
 				lastUpdate));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestConfig getConfig() {
 		if (config != null && config.eIsProxy()) {
-			final InternalEObject oldConfig = (InternalEObject) config;
+			InternalEObject oldConfig = (InternalEObject) config;
 			config = (TestConfig) eResolveProxy(oldConfig);
 			if (config != oldConfig) {
-				if (eNotificationRequired()) {
+				if (eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, ConfigPackage.TEST_DIFF__CONFIG,
 						oldConfig, config));
-				}
 			}
 		}
 		return config;
@@ -164,7 +165,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestConfig basicGetConfig() {
@@ -174,21 +175,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setConfig(TestConfig newConfig) {
-		final TestConfig oldConfig = config;
+		TestConfig oldConfig = config;
 		config = newConfig;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_DIFF__CONFIG, oldConfig, config));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestResult getOldResult() {
@@ -198,20 +198,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetOldResult(TestResult newOldResult, NotificationChain msgs) {
-		final TestResult oldOldResult = oldResult;
+		TestResult oldOldResult = oldResult;
 		oldResult = newOldResult;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ConfigPackage.TEST_DIFF__OLD_RESULT, oldOldResult, newOldResult);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -219,35 +218,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setOldResult(TestResult newOldResult) {
 		if (newOldResult != oldResult) {
 			NotificationChain msgs = null;
-			if (oldResult != null) {
-				msgs = ((InternalEObject) oldResult).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
-			}
-			if (newOldResult != null) {
-				msgs = ((InternalEObject) newOldResult).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
-			}
+			if (oldResult != null)
+				msgs = ((InternalEObject) oldResult).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
+			if (newOldResult != null)
+				msgs = ((InternalEObject) newOldResult).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__OLD_RESULT, null, msgs);
 			msgs = basicSetOldResult(newOldResult, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_DIFF__OLD_RESULT, newOldResult,
 				newOldResult));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestResult getNewResult() {
@@ -257,20 +251,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetNewResult(TestResult newNewResult, NotificationChain msgs) {
-		final TestResult oldNewResult = newResult;
+		TestResult oldNewResult = newResult;
 		newResult = newNewResult;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ConfigPackage.TEST_DIFF__NEW_RESULT, oldNewResult, newNewResult);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -278,35 +271,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setNewResult(TestResult newNewResult) {
 		if (newNewResult != newResult) {
 			NotificationChain msgs = null;
-			if (newResult != null) {
-				msgs = ((InternalEObject) newResult).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
-			}
-			if (newNewResult != null) {
-				msgs = ((InternalEObject) newNewResult).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
-			}
+			if (newResult != null)
+				msgs = ((InternalEObject) newResult).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
+			if (newNewResult != null)
+				msgs = ((InternalEObject) newNewResult).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_DIFF__NEW_RESULT, null, msgs);
 			msgs = basicSetNewResult(newNewResult, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
+		} else if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_DIFF__NEW_RESULT, newNewResult,
 				newNewResult));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -323,7 +311,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -332,9 +320,8 @@
 		case ConfigPackage.TEST_DIFF__LAST_UPDATE:
 			return getLastUpdate();
 		case ConfigPackage.TEST_DIFF__CONFIG:
-			if (resolve) {
+			if (resolve)
 				return getConfig();
-			}
 			return basicGetConfig();
 		case ConfigPackage.TEST_DIFF__OLD_RESULT:
 			return getOldResult();
@@ -347,7 +334,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -372,7 +359,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -397,7 +384,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -418,16 +405,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (lastUpdate: "); //$NON-NLS-1$
 		result.append(lastUpdate);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java
index 7e513e6..8b42815 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestResultImpl.java
@@ -23,16 +23,17 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getSeedCount <em>Seed Count</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getTestName <em>ESFuzzyTest Name
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getSeedCount <em>Seed Count</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getTestName <em>Test Name</em>}
+ * </li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getError <em>Error</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getFailure <em>Failure</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getExecutionTime <em>Execution Time
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestResultImpl#getExecutionTime
+ * <em>Execution Time</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -41,7 +42,7 @@
 	 * The default value of the '{@link #getSeedCount() <em>Seed Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getSeedCount()
 	 * @generated
 	 * @ordered
@@ -52,7 +53,7 @@
 	 * The cached value of the '{@link #getSeedCount() <em>Seed Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getSeedCount()
 	 * @generated
 	 * @ordered
@@ -60,10 +61,10 @@
 	protected int seedCount = SEED_COUNT_EDEFAULT;
 
 	/**
-	 * The default value of the '{@link #getTestName() <em>ESFuzzyTest Name</em>}' attribute.
+	 * The default value of the '{@link #getTestName() <em>Test Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTestName()
 	 * @generated
 	 * @ordered
@@ -71,10 +72,10 @@
 	protected static final String TEST_NAME_EDEFAULT = null;
 
 	/**
-	 * The cached value of the '{@link #getTestName() <em>ESFuzzyTest Name</em>}' attribute.
+	 * The cached value of the '{@link #getTestName() <em>Test Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTestName()
 	 * @generated
 	 * @ordered
@@ -85,7 +86,7 @@
 	 * The default value of the '{@link #getError() <em>Error</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getError()
 	 * @generated
 	 * @ordered
@@ -96,7 +97,7 @@
 	 * The cached value of the '{@link #getError() <em>Error</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getError()
 	 * @generated
 	 * @ordered
@@ -107,7 +108,7 @@
 	 * The default value of the '{@link #getFailure() <em>Failure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFailure()
 	 * @generated
 	 * @ordered
@@ -118,7 +119,7 @@
 	 * The cached value of the '{@link #getFailure() <em>Failure</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getFailure()
 	 * @generated
 	 * @ordered
@@ -129,7 +130,7 @@
 	 * The default value of the '{@link #getExecutionTime() <em>Execution Time</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getExecutionTime()
 	 * @generated
 	 * @ordered
@@ -140,7 +141,7 @@
 	 * The cached value of the '{@link #getExecutionTime() <em>Execution Time</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getExecutionTime()
 	 * @generated
 	 * @ordered
@@ -150,7 +151,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestResultImpl() {
@@ -160,7 +161,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -171,7 +172,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public int getSeedCount() {
@@ -181,22 +182,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setSeedCount(int newSeedCount) {
-		final int oldSeedCount = seedCount;
+		int oldSeedCount = seedCount;
 		seedCount = newSeedCount;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__SEED_COUNT, oldSeedCount,
 				seedCount));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getTestName() {
@@ -206,22 +206,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTestName(String newTestName) {
-		final String oldTestName = testName;
+		String oldTestName = testName;
 		testName = newTestName;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__TEST_NAME, oldTestName,
 				testName));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getError() {
@@ -231,21 +230,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setError(String newError) {
-		final String oldError = error;
+		String oldError = error;
 		error = newError;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__ERROR, oldError, error));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public String getFailure() {
@@ -255,22 +253,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setFailure(String newFailure) {
-		final String oldFailure = failure;
+		String oldFailure = failure;
 		failure = newFailure;
-		if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__FAILURE, oldFailure,
-				failure));
-		}
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__FAILURE, oldFailure, failure));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public long getExecutionTime() {
@@ -280,22 +277,21 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setExecutionTime(long newExecutionTime) {
-		final long oldExecutionTime = executionTime;
+		long oldExecutionTime = executionTime;
 		executionTime = newExecutionTime;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RESULT__EXECUTION_TIME,
 				oldExecutionTime, executionTime));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -318,7 +314,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -346,7 +342,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -374,7 +370,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -397,16 +393,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (seedCount: "); //$NON-NLS-1$
 		result.append(seedCount);
 		result.append(", testName: "); //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java
index 368850e..bc1cec2 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/impl/TestRunImpl.java
@@ -33,12 +33,12 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl#getConfig <em>Config</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl#getTime <em>Time</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.impl.TestRunImpl#getResults <em>Results</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -47,7 +47,7 @@
 	 * The cached value of the '{@link #getConfig() <em>Config</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getConfig()
 	 * @generated
 	 * @ordered
@@ -58,7 +58,7 @@
 	 * The default value of the '{@link #getTime() <em>Time</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTime()
 	 * @generated
 	 * @ordered
@@ -69,7 +69,7 @@
 	 * The cached value of the '{@link #getTime() <em>Time</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getTime()
 	 * @generated
 	 * @ordered
@@ -80,7 +80,7 @@
 	 * The cached value of the '{@link #getResults() <em>Results</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @see #getResults()
 	 * @generated
 	 * @ordered
@@ -90,7 +90,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestRunImpl() {
@@ -100,7 +100,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,7 +111,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public TestConfig getConfig() {
@@ -121,20 +121,19 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetConfig(TestConfig newConfig, NotificationChain msgs) {
-		final TestConfig oldConfig = config;
+		TestConfig oldConfig = config;
 		config = newConfig;
 		if (eNotificationRequired()) {
-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
 				ConfigPackage.TEST_RUN__CONFIG, oldConfig, newConfig);
-			if (msgs == null) {
+			if (msgs == null)
 				msgs = notification;
-			} else {
+			else
 				msgs.add(notification);
-			}
 		}
 		return msgs;
 	}
@@ -142,34 +141,30 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setConfig(TestConfig newConfig) {
 		if (newConfig != config) {
 			NotificationChain msgs = null;
-			if (config != null) {
-				msgs = ((InternalEObject) config).eInverseRemove(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_RUN__CONFIG, null, msgs);
-			}
-			if (newConfig != null) {
-				msgs = ((InternalEObject) newConfig).eInverseAdd(this, EOPPOSITE_FEATURE_BASE
-					- ConfigPackage.TEST_RUN__CONFIG, null, msgs);
-			}
+			if (config != null)
+				msgs = ((InternalEObject) config).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_RUN__CONFIG, null, msgs);
+			if (newConfig != null)
+				msgs = ((InternalEObject) newConfig).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - ConfigPackage.TEST_RUN__CONFIG, null, msgs);
 			msgs = basicSetConfig(newConfig, msgs);
-			if (msgs != null) {
+			if (msgs != null)
 				msgs.dispatch();
-			}
-		}
-		else if (eNotificationRequired()) {
-			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RUN__CONFIG, newConfig, newConfig));
-		}
+		} else if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RUN__CONFIG, newConfig, newConfig));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public Date getTime() {
@@ -179,21 +174,20 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public void setTime(Date newTime) {
-		final Date oldTime = time;
+		Date oldTime = time;
 		time = newTime;
-		if (eNotificationRequired()) {
+		if (eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, ConfigPackage.TEST_RUN__TIME, oldTime, time));
-		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public EList<TestResult> getResults() {
@@ -206,7 +200,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -223,7 +217,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -242,7 +236,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
@@ -266,7 +260,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -288,7 +282,7 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -307,16 +301,15 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) {
+		if (eIsProxy())
 			return super.toString();
-		}
 
-		final StringBuffer result = new StringBuffer(super.toString());
+		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (time: "); //$NON-NLS-1$
 		result.append(time);
 		result.append(')');
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java
index 8d46ace..cd6f9ad 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigAdapterFactory.java
@@ -28,7 +28,7 @@
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage
  * @generated
  */
@@ -37,7 +37,7 @@
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static ConfigPackage modelPackage;
@@ -46,7 +46,7 @@
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ConfigAdapterFactory() {
@@ -61,7 +61,7 @@
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance
 	 * object of the model.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
@@ -80,57 +80,56 @@
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected ConfigSwitch<Adapter> modelSwitch =
-		new ConfigSwitch<Adapter>() {
-			@Override
-			public Adapter caseTestConfig(TestConfig object) {
-				return createTestConfigAdapter();
-			}
+	protected ConfigSwitch<Adapter> modelSwitch = new ConfigSwitch<Adapter>() {
+		@Override
+		public Adapter caseTestConfig(TestConfig object) {
+			return createTestConfigAdapter();
+		}
 
-			@Override
-			public Adapter caseTestRun(TestRun object) {
-				return createTestRunAdapter();
-			}
+		@Override
+		public Adapter caseTestRun(TestRun object) {
+			return createTestRunAdapter();
+		}
 
-			@Override
-			public Adapter caseTestResult(TestResult object) {
-				return createTestResultAdapter();
-			}
+		@Override
+		public Adapter caseTestResult(TestResult object) {
+			return createTestResultAdapter();
+		}
 
-			@Override
-			public Adapter caseTestDiff(TestDiff object) {
-				return createTestDiffAdapter();
-			}
+		@Override
+		public Adapter caseTestDiff(TestDiff object) {
+			return createTestDiffAdapter();
+		}
 
-			@Override
-			public Adapter caseDiffReport(DiffReport object) {
-				return createDiffReportAdapter();
-			}
+		@Override
+		public Adapter caseDiffReport(DiffReport object) {
+			return createDiffReportAdapter();
+		}
 
-			@Override
-			public Adapter caseRoot(Root object) {
-				return createRootAdapter();
-			}
+		@Override
+		public Adapter caseRoot(Root object) {
+			return createRootAdapter();
+		}
 
-			@Override
-			public Adapter caseMutatorConfig(MutatorConfig object) {
-				return createMutatorConfigAdapter();
-			}
+		@Override
+		public Adapter caseMutatorConfig(MutatorConfig object) {
+			return createMutatorConfigAdapter();
+		}
 
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param target the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
@@ -142,12 +141,12 @@
 
 	/**
 	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig <em>ESFuzzyTest Config</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig <em>Test Config</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestConfig
 	 * @generated
@@ -158,12 +157,12 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
-	 * <em>ESFuzzyTest Run</em>}'.
+	 * <em>Test Run</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestRun
 	 * @generated
@@ -174,12 +173,12 @@
 
 	/**
 	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult <em>ESFuzzyTest Result</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult <em>Test Result</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestResult
 	 * @generated
@@ -190,12 +189,12 @@
 
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
-	 * <em>ESFuzzyTest Diff</em>}'.
+	 * <em>Test Diff</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.TestDiff
 	 * @generated
@@ -211,7 +210,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.DiffReport
 	 * @generated
@@ -227,7 +226,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.Root
 	 * @generated
@@ -243,7 +242,7 @@
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.MutatorConfig
 	 * @generated
@@ -257,7 +256,7 @@
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java
index f6759fe..f30e40a 100644
--- a/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.fuzzy.emf/src/org/eclipse/emf/emfstore/internal/fuzzy/emf/config/util/ConfigSwitch.java
@@ -33,7 +33,7 @@
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- *
+ * 
  * @see org.eclipse.emf.emfstore.internal.fuzzy.emf.config.ConfigPackage
  * @generated
  */
@@ -42,7 +42,7 @@
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected static ConfigPackage modelPackage;
@@ -51,7 +51,7 @@
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public ConfigSwitch() {
@@ -65,7 +65,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -78,7 +78,7 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
@@ -86,10 +86,8 @@
 		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);
+		List<EClass> eSuperTypes = theEClass.getESuperTypes();
+		return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
 	}
 
 	/**
@@ -97,66 +95,59 @@
 	 * result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	protected T doSwitch(int classifierID, EObject theEObject) {
 		switch (classifierID) {
 		case ConfigPackage.TEST_CONFIG: {
-			final TestConfig testConfig = (TestConfig) theEObject;
+			TestConfig testConfig = (TestConfig) theEObject;
 			T result = caseTestConfig(testConfig);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ConfigPackage.TEST_RUN: {
-			final TestRun testRun = (TestRun) theEObject;
+			TestRun testRun = (TestRun) theEObject;
 			T result = caseTestRun(testRun);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ConfigPackage.TEST_RESULT: {
-			final TestResult testResult = (TestResult) theEObject;
+			TestResult testResult = (TestResult) theEObject;
 			T result = caseTestResult(testResult);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ConfigPackage.TEST_DIFF: {
-			final TestDiff testDiff = (TestDiff) theEObject;
+			TestDiff testDiff = (TestDiff) theEObject;
 			T result = caseTestDiff(testDiff);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ConfigPackage.DIFF_REPORT: {
-			final DiffReport diffReport = (DiffReport) theEObject;
+			DiffReport diffReport = (DiffReport) theEObject;
 			T result = caseDiffReport(diffReport);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ConfigPackage.ROOT: {
-			final Root root = (Root) theEObject;
+			Root root = (Root) theEObject;
 			T result = caseRoot(root);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		case ConfigPackage.MUTATOR_CONFIG: {
-			final MutatorConfig mutatorConfig = (MutatorConfig) theEObject;
+			MutatorConfig mutatorConfig = (MutatorConfig) theEObject;
 			T result = caseMutatorConfig(mutatorConfig);
-			if (result == null) {
+			if (result == null)
 				result = defaultCase(theEObject);
-			}
 			return result;
 		}
 		default:
@@ -165,14 +156,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Config</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Test Config</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Config</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Test Config</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -181,14 +172,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Run</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Test Run</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Run</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Test Run</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -197,14 +188,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Result</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Test Result</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Result</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Test Result</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -213,14 +204,14 @@
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '<em>ESFuzzyTest Diff</em>'.
+	 * Returns the result of interpreting the object as an instance of '<em>Test Diff</em>'.
 	 * <!-- begin-user-doc -->
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>ESFuzzyTest Diff</em>'.
+	 * @return the result of interpreting the object as an instance of '<em>Test Diff</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -234,7 +225,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diff Report</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -250,7 +241,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Root</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -266,7 +257,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Mutator Config</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
@@ -282,7 +273,7 @@
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @param object the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java
index 36ff49b..82dd916 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/AttributeChangeMutation.java
@@ -126,16 +126,15 @@
 		final EAttribute eAttribute = (EAttribute) getTargetContainerSelector().getTargetFeature();
 
 		Object newValue = createNewValue(eAttribute);
-		if (newValue != null && eAttribute.isID() && !getUtil().getModelMutatorConfiguration().isAllowDuplicateIDs())
-		{
+		if (newValue != null && eAttribute.isID() && !getUtil().getModelMutatorConfiguration().isAllowDuplicateIDs()) {
 			while (!getUtil().isUniqueID(newValue)) {
 				newValue = createNewValue(eAttribute);
 			}
 			getUtil().registerID(newValue);
 		}
 		if (eAttribute.isMany()) {
-			final int insertionIndex = getTargetContainerSelector().
-				getRandomIndexFromTargetObjectAndFeatureValueRange();
+			final int insertionIndex = getTargetContainerSelector()
+				.getRandomIndexFromTargetObjectAndFeatureValueRange();
 			getUtil().setPerCommand(eObject, eAttribute, newValue, insertionIndex);
 		} else {
 			getUtil().setPerCommand(eObject, eAttribute, newValue);
@@ -151,8 +150,7 @@
 
 		if (eAttribute.isMany()) {
 			final List<?> currentValues = (List<?>) eObject.eGet(eAttribute);
-			final int deletionIndex = getTargetContainerSelector().
-				getRandomIndexFromTargetObjectAndFeatureValueRange();
+			final int deletionIndex = getTargetContainerSelector().getRandomIndexFromTargetObjectAndFeatureValueRange();
 			currentValues.remove(deletionIndex);
 			getUtil().setPerCommand(eObject, eAttribute, currentValues);
 		} else {
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java
index 2136fe2..7fe996c 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/FeatureMapValueMutation.java
@@ -122,7 +122,7 @@
 				final FeatureMapEntryImpl featureMapEntry = FeatureMapEntryImpl.class.cast(entry);
 				featureMapEntry.setReferenceValue(
 					createOfType(
-					EReference.class.cast(featureMapEntry.getEStructuralFeature()).getEReferenceType()));
+						EReference.class.cast(featureMapEntry.getEStructuralFeature()).getEReferenceType()));
 			}
 		} else if (ContainmentUpdatingFeatureMapEntry.class.isInstance(entry)) {
 			// TODO
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java
index 2b41268..7e2aeac 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MoveObjectMutation.java
@@ -46,7 +46,8 @@
  * @author Philip Langer
  *
  */
-public class MoveObjectMutation extends ContainmentChangeMutation<ESMoveObjectMutation> implements ESMoveObjectMutation {
+public class MoveObjectMutation extends ContainmentChangeMutation<ESMoveObjectMutation>
+	implements ESMoveObjectMutation {
 
 	private final MutationTargetSelector sourceContainerSelector;
 	private EObject eObjectToMove;
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java
index 7f9056b..524f2be 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationPredicates.java
@@ -52,123 +52,112 @@
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is a {@link EReference}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_REFERENCE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return input != null && input instanceof EReference;
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_REFERENCE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return input != null && input instanceof EReference;
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is a containment {@link EReference}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_REFERENCE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return IS_REFERENCE.apply(input)
-					&& ((EReference) input).isContainment();
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return IS_REFERENCE.apply(input)
+				&& ((EReference) input).isContainment();
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is a containment {@link EReference} or the opposite of
 	 * a containment {@link EReference}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_OR_OPPOSITE_OF_CONTAINMENT_REFERENCE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return IS_CONTAINMENT_REFERENCE.apply(input) || IS_OPPOSITE_OF_CONTAINMENT_REFERENCE.apply(input);
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_CONTAINMENT_OR_OPPOSITE_OF_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return IS_CONTAINMENT_REFERENCE.apply(input) || IS_OPPOSITE_OF_CONTAINMENT_REFERENCE.apply(input);
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is the opposite of a containment {@link EReference}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_OPPOSITE_OF_CONTAINMENT_REFERENCE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return input != null
-					&& input instanceof EReference
-					&& ((EReference) input).getEOpposite() != null
-					&& ((EReference) input).getEOpposite().isContainment();
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_OPPOSITE_OF_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return input != null
+				&& input instanceof EReference
+				&& ((EReference) input).getEOpposite() != null
+				&& ((EReference) input).getEOpposite().isContainment();
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is a mutable containment {@link EReference}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_MUTABLE_CONTAINMENT_REFERENCE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return IS_MUTABLE.apply(input)
-					&& IS_CONTAINMENT_REFERENCE.apply(input);
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_MUTABLE_CONTAINMENT_REFERENCE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return IS_MUTABLE.apply(input)
+				&& IS_CONTAINMENT_REFERENCE.apply(input);
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is mutable.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_MUTABLE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return input != null && input.isChangeable();
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_MUTABLE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return input != null && input.isChangeable();
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is multi-valued.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_MULTI_VALUED =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return input != null && input.isMany();
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_MULTI_VALUED = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return input != null && input.isMany();
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is a mutable {@link EAttribute}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_MUTABLE_ATTRIBUTE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return IS_MUTABLE.apply(input) && input instanceof EAttribute;
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_MUTABLE_ATTRIBUTE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return IS_MUTABLE.apply(input) && input instanceof EAttribute;
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is a mutable {@link EReference}.
 	 */
-	public static final Predicate<? super EStructuralFeature> IS_MUTABLE_REFERENCE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return IS_MUTABLE.apply(input) && input instanceof EReference;
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> IS_MUTABLE_REFERENCE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return IS_MUTABLE.apply(input) && input instanceof EReference;
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is of type
 	 * {@link org.eclipse.emf.ecore.change.FeatureMapEntry FeatureMapEntry}.
 	 */
-	public static final Predicate<? super EStructuralFeature> HAS_FEATURE_MAP_ENTRY_TYPE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return input != null
-					&& EcorePackage.eINSTANCE.getEFeatureMapEntry().equals(input.getEType());
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> HAS_FEATURE_MAP_ENTRY_TYPE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return input != null
+				&& EcorePackage.eINSTANCE.getEFeatureMapEntry().equals(input.getEType());
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} is the feature map attribute of a feature map group.
 	 */
-	public static final Predicate<? super EStructuralFeature> HAS_GROUP_FEATURE_MAP_ENTRY_TYPE =
-		new Predicate<EStructuralFeature>() {
-			public boolean apply(EStructuralFeature input) {
-				return HAS_FEATURE_MAP_ENTRY_TYPE.apply(input)
-					&& input.getEAnnotation(EXTENDED_META_DATA) != null
-					&& input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND) != null
-					&& input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND).equals(GROUP);
-			}
-		};
+	public static final Predicate<? super EStructuralFeature> HAS_GROUP_FEATURE_MAP_ENTRY_TYPE = new Predicate<EStructuralFeature>() {
+		public boolean apply(EStructuralFeature input) {
+			return HAS_FEATURE_MAP_ENTRY_TYPE.apply(input)
+				&& input.getEAnnotation(EXTENDED_META_DATA) != null
+				&& input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND) != null
+				&& input.getEAnnotation(EXTENDED_META_DATA).getDetails().get(KIND).equals(GROUP);
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link EStructuralFeature} may take the given {@code eObject} as value.
@@ -199,7 +188,7 @@
 			public boolean apply(EStructuralFeature input) {
 				return input != null &&
 					(input.getEType() == feature.getEType()
-					|| isSubTypeOf(input.getEType(), feature.getEType()));
+						|| isSubTypeOf(input.getEType(), feature.getEType()));
 			}
 		};
 	}
@@ -333,12 +322,11 @@
 	/**
 	 * Predicate specifying whether an {@link Object} is not <code>null</code> or an empty list.
 	 */
-	public static final Predicate<? super Object> IS_NON_EMPTY_VALUE_OR_LIST =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return !(input == null || isEmptyList(input));
-			}
-		};
+	public static final Predicate<? super Object> IS_NON_EMPTY_VALUE_OR_LIST = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return !(input == null || isEmptyList(input));
+		}
+	};
 
 	private static boolean isEmptyList(Object input) {
 		if (input instanceof List<?>) {
@@ -351,44 +339,40 @@
 	/**
 	 * Predicate specifying whether an {@link Object} is a feature map containing at least one value.
 	 */
-	public static final Predicate<? super Object> IS_NON_EMPTY_FEATURE_MAP =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return input != null && input instanceof FeatureMap && ((FeatureMap) input).size() > 0;
-			}
-		};
+	public static final Predicate<? super Object> IS_NON_EMPTY_FEATURE_MAP = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return input != null && input instanceof FeatureMap && ((FeatureMap) input).size() > 0;
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link Object} is an {@link EObject} or a list of {@link EObject EObjects}
 	 * containing at least one EObject.
 	 */
-	public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_OR_LIST =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return IS_NON_NULL_EOBJECT.apply(input) || IS_NON_EMPTY_EOBJECT_LIST.apply(input);
-			}
-		};
+	public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_OR_LIST = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return IS_NON_NULL_EOBJECT.apply(input) || IS_NON_EMPTY_EOBJECT_LIST.apply(input);
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link Object} is not null and an {@link EObject}.
 	 */
-	public static final Predicate<? super Object> IS_NON_NULL_EOBJECT =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return input != null && input instanceof EObject;
-			}
-		};
+	public static final Predicate<? super Object> IS_NON_NULL_EOBJECT = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return input != null && input instanceof EObject;
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link Object} is a list of {@link EObject EObjects} containing at least one
 	 * EObject.
 	 */
-	public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_LIST =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return input instanceof List<?> && isNonEmptyEObjectList((List<?>) input);
-			}
-		};
+	public static final Predicate<? super Object> IS_NON_EMPTY_EOBJECT_LIST = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return input instanceof List<?> && isNonEmptyEObjectList((List<?>) input);
+		}
+	};
 
 	private static boolean isNonEmptyEObjectList(List<?> input) {
 		return !input.isEmpty() && all(input, IS_NON_NULL_EOBJECT);
@@ -397,22 +381,20 @@
 	/**
 	 * Predicate specifying whether an {@link Object} is <code>null</code> or a list.
 	 */
-	public static final Predicate<? super Object> IS_NULL_OR_LIST =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return input == null || IS_LIST.apply(input);
-			}
-		};
+	public static final Predicate<? super Object> IS_NULL_OR_LIST = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return input == null || IS_LIST.apply(input);
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link Object} is a list.
 	 */
-	public static final Predicate<? super Object> IS_LIST =
-		new Predicate<Object>() {
-			public boolean apply(Object input) {
-				return input instanceof List<?>;
-			}
-		};
+	public static final Predicate<? super Object> IS_LIST = new Predicate<Object>() {
+		public boolean apply(Object input) {
+			return input instanceof List<?>;
+		}
+	};
 
 	/**
 	 * Predicate specifying whether an {@link Object} is the container of an {@link EObject} that itself has at most the
@@ -422,7 +404,8 @@
 	 * @return <code>true</code> if it contains an {@link EObject} that itself has a less or equal number of
 	 *         containments than specified in {@code maxNumberOfContainments}, <code>false</code> otherwise.
 	 */
-	public static Predicate<? super Object> containsEObjectWithMaxNumberOfContainments(final int maxNumberOfContainments) {
+	public static Predicate<? super Object> containsEObjectWithMaxNumberOfContainments(
+		final int maxNumberOfContainments) {
 		return new Predicate<Object>() {
 			public boolean apply(Object input) {
 				return input != null
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java
index 527450f..0675883 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/ReferenceChangeMutation.java
@@ -127,8 +127,8 @@
 		final boolean success;
 		if (newValue != null) {
 			if (eReference.isMany()) {
-				final int insertionIndex = getTargetContainerSelector().
-					getRandomIndexFromTargetObjectAndFeatureValueRange();
+				final int insertionIndex = getTargetContainerSelector()
+					.getRandomIndexFromTargetObjectAndFeatureValueRange();
 				getUtil().addPerCommand(eObject, eReference, newValue, insertionIndex);
 			} else {
 				getUtil().setPerCommand(eObject, eReference, newValue);
@@ -155,8 +155,7 @@
 		final EObject newReferenceValue;
 		final EReference eReference = (EReference) getTargetContainerSelector().getTargetFeature();
 
-		final Iterable<EObject> suitableEObjects = getUtil().
-			getSuitableEObjectsForAvailableFeature(eReference);
+		final Iterable<EObject> suitableEObjects = getUtil().getSuitableEObjectsForAvailableFeature(eReference);
 		final int numberOfAvailableEObjects = size(suitableEObjects);
 
 		if (numberOfAvailableEObjects < 1) {
diff --git a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java
index 7f74aca..9e180f6 100644
--- a/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java
+++ b/bundles/org.eclipse.emf.emfstore.modelmutator/src/org/eclipse/emf/emfstore/modelmutator/ESCrossResourceReferencesModelMutator.java
@@ -135,9 +135,8 @@
 	private ResourceSet createResourceSet(int howManyResources) {
 		final ResourceSet resourceSet = new ResourceSetImpl();
 		for (int i = 0; i < howManyResources; i++) {
-			final Resource resource =
-				resourceSet.createResource(
-					createVirtualUri(Integer.toString(i)));
+			final Resource resource = resourceSet.createResource(
+				createVirtualUri(Integer.toString(i)));
 			resources.add(resource);
 		}
 		return resourceSet;
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java
index b8fd208..4ba6356 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACGroupItemProvider.java
@@ -61,11 +61,11 @@
 	 * @generated
 	 */
 	protected void addMembersPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_ACGroup_members_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACGroup_members_feature", "_UI_ACGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			AccesscontrolPackage.Literals.AC_GROUP__MEMBERS, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACGroup_members_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACGroup_members_feature", "_UI_ACGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				AccesscontrolPackage.Literals.AC_GROUP__MEMBERS, true, false, true, null, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java
index 620bce1..28a5186 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACOrgUnitItemProvider.java
@@ -71,13 +71,12 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ACOrgUnit_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_name_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			AccesscontrolPackage.Literals.AC_ORG_UNIT__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACOrgUnit_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_name_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				AccesscontrolPackage.Literals.AC_ORG_UNIT__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -87,11 +86,11 @@
 	 * @generated
 	 */
 	protected void addRolesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_ACOrgUnit_roles_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_roles_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			AccesscontrolPackage.Literals.AC_ORG_UNIT__ROLES, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACOrgUnit_roles_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_roles_feature", "_UI_ACOrgUnit_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				AccesscontrolPackage.Literals.AC_ORG_UNIT__ROLES, true, false, true, null, null, null));
 	}
 
 	/**
@@ -101,14 +100,13 @@
 	 * @generated
 	 */
 	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ACOrgUnit_description_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ACOrgUnit_type"), //$NON-NLS-1$
-			AccesscontrolPackage.Literals.AC_ORG_UNIT__DESCRIPTION, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACOrgUnit_description_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACOrgUnit_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ACOrgUnit_type"), //$NON-NLS-1$
+				AccesscontrolPackage.Literals.AC_ORG_UNIT__DESCRIPTION, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java
index c18a9b5..0f11163 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/ACUserItemProvider.java
@@ -67,13 +67,12 @@
 	 * @generated
 	 */
 	protected void addFirstNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ACUser_firstName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACUser_firstName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			AccesscontrolPackage.Literals.AC_USER__FIRST_NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACUser_firstName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACUser_firstName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				AccesscontrolPackage.Literals.AC_USER__FIRST_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,13 +82,12 @@
 	 * @generated
 	 */
 	protected void addLastNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ACUser_lastName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACUser_lastName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			AccesscontrolPackage.Literals.AC_USER__LAST_NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACUser_lastName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACUser_lastName_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				AccesscontrolPackage.Literals.AC_USER__LAST_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -100,13 +98,12 @@
 	 * @generated
 	 */
 	protected void addPasswordPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ACUser_password_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ACUser_password_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			AccesscontrolPackage.Literals.AC_USER__PASSWORD, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ACUser_password_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ACUser_password_feature", "_UI_ACUser_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				AccesscontrolPackage.Literals.AC_USER__PASSWORD, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java
index 98bafa5..c3acd24 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/AccesscontrolItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class AccesscontrolItemProviderAdapterFactory extends AccesscontrolAdapterFactory implements
-	ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class AccesscontrolItemProviderAdapterFactory extends AccesscontrolAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java
index 4905944..ce40367 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/provider/OrgUnitPropertyItemProvider.java
@@ -38,8 +38,8 @@
  *
  * @generated
  */
-public class OrgUnitPropertyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class OrgUnitPropertyItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -75,14 +75,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_OrgUnitProperty_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_OrgUnitProperty_type"), //$NON-NLS-1$
-			AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_OrgUnitProperty_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_OrgUnitProperty_type"), //$NON-NLS-1$
+				AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -92,14 +91,13 @@
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_OrgUnitProperty_value_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_OrgUnitProperty_type"), //$NON-NLS-1$
-			AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_OrgUnitProperty_value_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_OrgUnitProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_OrgUnitProperty_type"), //$NON-NLS-1$
+				AccesscontrolPackage.Literals.ORG_UNIT_PROPERTY__VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java
index 3750836..38caef7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RoleItemProvider.java
@@ -33,8 +33,8 @@
  *
  * @generated
  */
-public class RoleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class RoleItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -68,11 +68,11 @@
 	 * @generated
 	 */
 	protected void addProjectsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_Role_projects_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_Role_projects_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			RolesPackage.Literals.ROLE__PROJECTS, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Role_projects_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Role_projects_feature", "_UI_Role_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				RolesPackage.Literals.ROLE__PROJECTS, true, false, true, null, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java
index 177875d..917fce8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/provider/RolesItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class RolesItemProviderAdapterFactory extends RolesAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable {
+public class RolesItemProviderAdapterFactory extends RolesAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java
index fff1726..b47b3b3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/AuthenticationInformationItemProvider.java
@@ -36,8 +36,8 @@
  *
  * @generated
  */
-public class AuthenticationInformationItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class AuthenticationInformationItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -153,8 +153,7 @@
 		newChildDescriptors.add(createChildParameter(ModelPackage.Literals.AUTHENTICATION_INFORMATION__SESSION_ID,
 			ModelFactory.eINSTANCE.createSessionId()));
 
-		newChildDescriptors.add(createChildParameter(
-			ModelPackage.Literals.AUTHENTICATION_INFORMATION__RESOLVED_AC_USER,
+		newChildDescriptors.add(createChildParameter(ModelPackage.Literals.AUTHENTICATION_INFORMATION__RESOLVED_AC_USER,
 			AccesscontrolFactory.eINSTANCE.createACUser()));
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java
index d133251..aa5d993 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ClientVersionInfoItemProvider.java
@@ -35,8 +35,8 @@
  *
  * @generated
  */
-public class ClientVersionInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ClientVersionInfoItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -71,14 +71,13 @@
 	 * @generated
 	 */
 	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ClientVersionInfo_version_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ClientVersionInfo_type"), //$NON-NLS-1$
-			ModelPackage.Literals.CLIENT_VERSION_INFO__VERSION, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ClientVersionInfo_version_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ClientVersionInfo_type"), //$NON-NLS-1$
+				ModelPackage.Literals.CLIENT_VERSION_INFO__VERSION, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -89,14 +88,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ClientVersionInfo_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ClientVersionInfo_type"), //$NON-NLS-1$
-			ModelPackage.Literals.CLIENT_VERSION_INFO__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ClientVersionInfo_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ClientVersionInfo_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ClientVersionInfo_type"), //$NON-NLS-1$
+				ModelPackage.Literals.CLIENT_VERSION_INFO__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java
index d8b525e..9a0756d 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ModelItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class ModelItemProviderAdapterFactory extends ModelAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable {
+public class ModelItemProviderAdapterFactory extends ModelAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java
index 94022d1..7b1b3ae 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectHistoryItemProvider.java
@@ -38,8 +38,8 @@
  *
  * @generated
  */
-public class ProjectHistoryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProjectHistoryItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -74,14 +74,13 @@
 	 * @generated
 	 */
 	protected void addProjectNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ProjectHistory_projectName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectName_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ProjectHistory_type"), //$NON-NLS-1$
-			ModelPackage.Literals.PROJECT_HISTORY__PROJECT_NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ProjectHistory_projectName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ProjectHistory_type"), //$NON-NLS-1$
+				ModelPackage.Literals.PROJECT_HISTORY__PROJECT_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -91,14 +90,13 @@
 	 * @generated
 	 */
 	protected void addProjectDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ProjectHistory_projectDescription_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ProjectHistory_type"), //$NON-NLS-1$
-			ModelPackage.Literals.PROJECT_HISTORY__PROJECT_DESCRIPTION, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ProjectHistory_projectDescription_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectHistory_projectDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ProjectHistory_type"), //$NON-NLS-1$
+				ModelPackage.Literals.PROJECT_HISTORY__PROJECT_DESCRIPTION, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java
index 064c769..1a4f262 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/ProjectInfoItemProvider.java
@@ -35,8 +35,8 @@
  *
  * @generated
  */
-public class ProjectInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ProjectInfoItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -74,13 +74,12 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ProjectInfo_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_name_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			ModelPackage.Literals.PROJECT_INFO__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-			null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ProjectInfo_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_name_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				ModelPackage.Literals.PROJECT_INFO__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -90,14 +89,13 @@
 	 * @generated
 	 */
 	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ProjectInfo_description_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ProjectInfo_type"), //$NON-NLS-1$
-			ModelPackage.Literals.PROJECT_INFO__DESCRIPTION, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ProjectInfo_description_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_description_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ProjectInfo_type"), //$NON-NLS-1$
+				ModelPackage.Literals.PROJECT_INFO__DESCRIPTION, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -109,10 +107,9 @@
 	protected void addProjectIdPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ProjectInfo_projectId_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_ProjectInfo_projectId_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getResourceLocator(), getString("_UI_ProjectInfo_projectId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_projectId_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ProjectInfo_type"), //$NON-NLS-1$
 				ModelPackage.Literals.PROJECT_INFO__PROJECT_ID, true, false, true, null, null, null));
 	}
 
@@ -123,11 +120,12 @@
 	 * @generated
 	 */
 	protected void addVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_ProjectInfo_version_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_version_feature", "_UI_ProjectInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			ModelPackage.Literals.PROJECT_INFO__VERSION, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ProjectInfo_version_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectInfo_version_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ProjectInfo_type"), //$NON-NLS-1$
+				ModelPackage.Literals.PROJECT_INFO__VERSION, true, false, true, null, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java
index f10f179..e6e5774 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/provider/VersionInfoItemProvider.java
@@ -70,14 +70,13 @@
 	 * @generated
 	 */
 	protected void addEmfStoreVersionStringPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_VersionInfo_emfStoreVersionString_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_VersionInfo_emfStoreVersionString_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_VersionInfo_type"), //$NON-NLS-1$
-			ModelPackage.Literals.VERSION_INFO__EMF_STORE_VERSION_STRING, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_VersionInfo_emfStoreVersionString_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_VersionInfo_emfStoreVersionString_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_VersionInfo_type"), //$NON-NLS-1$
+				ModelPackage.Literals.VERSION_INFO__EMF_STORE_VERSION_STRING, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java
index d8896a1..8cb539a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlFragmentItemProvider.java
@@ -38,8 +38,8 @@
  *
  * @generated
  */
-public class ModelElementUrlFragmentItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ModelElementUrlFragmentItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -74,14 +74,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ModelElementUrlFragment_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ModelElementUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ModelElementUrlFragment_type"), //$NON-NLS-1$
-			UrlPackage.Literals.MODEL_ELEMENT_URL_FRAGMENT__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ModelElementUrlFragment_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ModelElementUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ModelElementUrlFragment_type"), //$NON-NLS-1$
+				UrlPackage.Literals.MODEL_ELEMENT_URL_FRAGMENT__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java
index 469d212..eba2a2a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ModelElementUrlItemProvider.java
@@ -36,8 +36,8 @@
  *
  * @generated
  */
-public class ModelElementUrlItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ModelElementUrlItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java
index d645188..4fd59a4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ProjectUrlFragmentItemProvider.java
@@ -74,14 +74,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ProjectUrlFragment_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ProjectUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ProjectUrlFragment_type"), //$NON-NLS-1$
-			UrlPackage.Literals.PROJECT_URL_FRAGMENT__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ProjectUrlFragment_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ProjectUrlFragment_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ProjectUrlFragment_type"), //$NON-NLS-1$
+				UrlPackage.Literals.PROJECT_URL_FRAGMENT__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java
index e2959dd..0b0d022 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/ServerUrlItemProvider.java
@@ -36,8 +36,8 @@
  *
  * @generated
  */
-public class ServerUrlItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ServerUrlItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -72,13 +72,12 @@
 	 * @generated
 	 */
 	protected void addHostNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ServerUrl_hostName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_hostName_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			UrlPackage.Literals.SERVER_URL__HOST_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-			null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ServerUrl_hostName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_hostName_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				UrlPackage.Literals.SERVER_URL__HOST_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -89,13 +88,12 @@
 	 * @generated
 	 */
 	protected void addPortPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ServerUrl_port_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_port_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			UrlPackage.Literals.SERVER_URL__PORT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-			null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ServerUrl_port_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ServerUrl_port_feature", "_UI_ServerUrl_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				UrlPackage.Literals.SERVER_URL__PORT, true, false, false, ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
+				null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java
index d2707e6..fd67dbb 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/url/provider/UrlItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class UrlItemProviderAdapterFactory extends UrlAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable {
+public class UrlItemProviderAdapterFactory extends UrlAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java
index c13d34a..63920a8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventItemProvider.java
@@ -37,8 +37,8 @@
  *
  * @generated
  */
-public class EventItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class EventItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -72,13 +72,12 @@
 	 * @generated
 	 */
 	protected void addTimestampPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_Event_timestamp_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_Event_timestamp_feature", "_UI_Event_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			EventsPackage.Literals.EVENT__TIMESTAMP, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-			null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Event_timestamp_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Event_timestamp_feature", "_UI_Event_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				EventsPackage.Literals.EVENT__TIMESTAMP, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+				null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java
index 240a999..84952df 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/provider/EventsItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class EventsItemProviderAdapterFactory extends EventsAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable {
+public class EventsItemProviderAdapterFactory extends EventsAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java
index db11b11..1d3402f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/provider/ServerItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class ServerItemProviderAdapterFactory extends ServerAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable {
+public class ServerItemProviderAdapterFactory extends ServerAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java
index 9157775..b80df0b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AbstractOperationItemProvider.java
@@ -109,10 +109,9 @@
 	protected void addModelElementIdPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_AbstractOperation_modelElementId_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_AbstractOperation_modelElementId_feature", "_UI_AbstractOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getResourceLocator(), getString("_UI_AbstractOperation_modelElementId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AbstractOperation_modelElementId_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_AbstractOperation_type"), //$NON-NLS-1$
 				OperationsPackage.Literals.ABSTRACT_OPERATION__MODEL_ELEMENT_ID, true, false, true, null, null, null));
 	}
 
@@ -124,12 +123,10 @@
 	 */
 	protected void addAcceptedPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_AbstractOperation_accepted_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_AbstractOperation_accepted_feature", "_UI_AbstractOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AbstractOperation_accepted_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AbstractOperation_accepted_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_AbstractOperation_type"), //$NON-NLS-1$
 				OperationsPackage.Literals.ABSTRACT_OPERATION__ACCEPTED, true, false, false,
 				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
@@ -142,12 +139,10 @@
 	 */
 	protected void addClientDatePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_AbstractOperation_clientDate_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_AbstractOperation_clientDate_feature", "_UI_AbstractOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AbstractOperation_clientDate_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AbstractOperation_clientDate_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_AbstractOperation_type"), //$NON-NLS-1$
 				OperationsPackage.Literals.ABSTRACT_OPERATION__CLIENT_DATE, true, false, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java
index 9501316..bbadb36 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/AttributeOperationItemProvider.java
@@ -65,14 +65,13 @@
 	 * @generated
 	 */
 	protected void addOldValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_AttributeOperation_oldValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_AttributeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.ATTRIBUTE_OPERATION__OLD_VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeOperation_oldValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_AttributeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.ATTRIBUTE_OPERATION__OLD_VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -82,14 +81,13 @@
 	 * @generated
 	 */
 	protected void addNewValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_AttributeOperation_newValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_AttributeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.ATTRIBUTE_OPERATION__NEW_VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_AttributeOperation_newValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_AttributeOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_AttributeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.ATTRIBUTE_OPERATION__NEW_VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
index 0639699..562c869 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CompositeOperationItemProvider.java
@@ -101,12 +101,12 @@
 	 * @generated
 	 */
 	protected void addMainOperationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_CompositeOperation_mainOperation_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_mainOperation_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_CompositeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.COMPOSITE_OPERATION__MAIN_OPERATION, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_CompositeOperation_mainOperation_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_mainOperation_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CompositeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.COMPOSITE_OPERATION__MAIN_OPERATION, true, false, true, null, null, null));
 	}
 
 	/**
@@ -116,14 +116,13 @@
 	 * @generated
 	 */
 	protected void addCompositeNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_CompositeOperation_compositeName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeName_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_CompositeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_CompositeOperation_compositeName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CompositeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -133,14 +132,13 @@
 	 * @generated
 	 */
 	protected void addCompositeDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_CompositeOperation_compositeDescription_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_CompositeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_DESCRIPTION, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_CompositeOperation_compositeDescription_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_compositeDescription_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CompositeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.COMPOSITE_OPERATION__COMPOSITE_DESCRIPTION, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -150,14 +148,13 @@
 	 * @generated
 	 */
 	protected void addReversedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_CompositeOperation_reversed_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_reversed_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_CompositeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.COMPOSITE_OPERATION__REVERSED, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_CompositeOperation_reversed_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_CompositeOperation_reversed_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CompositeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.COMPOSITE_OPERATION__REVERSED, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java
index 3fe9aec..f6635de 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/CreateDeleteOperationItemProvider.java
@@ -82,12 +82,10 @@
 	 */
 	protected void addDeletePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_CreateDeleteOperation_delete_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_CreateDeleteOperation_delete_feature", "_UI_CreateDeleteOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_CreateDeleteOperation_delete_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_CreateDeleteOperation_delete_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_CreateDeleteOperation_type"), //$NON-NLS-1$
 				OperationsPackage.Literals.CREATE_DELETE_OPERATION__DELETE, true, false, false,
 				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
@@ -445,21 +443,18 @@
 		newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__MODEL_ELEMENT,
 			org.eclipse.emf.emfstore.internal.common.model.ModelFactory.eINSTANCE.createPropertyStringValue()));
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
+		newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
 			OperationsFactory.eINSTANCE.createSingleReferenceOperation()));
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
+		newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
 			OperationsFactory.eINSTANCE.createMultiReferenceSetOperation()));
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
+		newChildDescriptors.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__SUB_OPERATIONS,
 			OperationsFactory.eINSTANCE.createMultiReferenceOperation()));
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.CREATE_DELETE_OPERATION__EOBJECT_TO_ID_MAP,
-			OperationsFactory.eINSTANCE.create(OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP)));
+		newChildDescriptors
+			.add(createChildParameter(OperationsPackage.Literals.CREATE_DELETE_OPERATION__EOBJECT_TO_ID_MAP,
+				OperationsFactory.eINSTANCE.create(OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP)));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java
index 779c13e..6002dc3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/EObjectToModelElementIdMapItemProvider.java
@@ -33,8 +33,8 @@
  *
  * @generated
  */
-public class EObjectToModelElementIdMapItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class EObjectToModelElementIdMapItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -70,12 +70,12 @@
 	 * @generated
 	 */
 	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_EObjectToModelElementIdMap_key_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_EObjectToModelElementIdMap_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_EObjectToModelElementIdMap_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP__KEY, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_EObjectToModelElementIdMap_key_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_EObjectToModelElementIdMap_key_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_EObjectToModelElementIdMap_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.EOBJECT_TO_MODEL_ELEMENT_ID_MAP__KEY, true, false, true, null, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java
index 7494f20..f2fd6a4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/FeatureOperationItemProvider.java
@@ -65,14 +65,13 @@
 	 * @generated
 	 */
 	protected void addFeatureNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_FeatureOperation_featureName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_featureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_FeatureOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.FEATURE_OPERATION__FEATURE_NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_FeatureOperation_featureName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_featureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_FeatureOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.FEATURE_OPERATION__FEATURE_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,14 +82,13 @@
 	 * @generated
 	 */
 	protected void addUnsetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_FeatureOperation_unset_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_unset_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_FeatureOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.FEATURE_OPERATION__UNSET, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_FeatureOperation_unset_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_FeatureOperation_unset_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_FeatureOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.FEATURE_OPERATION__UNSET, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java
index 4daeca5..2499f0b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ModelElementGroupItemProvider.java
@@ -75,12 +75,10 @@
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementGroup_name_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_name_feature", "_UI_ModelElementGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ModelElementGroup_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ModelElementGroup_type"), //$NON-NLS-1$
 				OperationsPackage.Literals.MODEL_ELEMENT_GROUP__NAME, true, false, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -109,10 +107,9 @@
 	protected void addModelElementsPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ModelElementGroup_modelElements_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_modelElements_feature", "_UI_ModelElementGroup_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getResourceLocator(), getString("_UI_ModelElementGroup_modelElements_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ModelElementGroup_modelElements_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ModelElementGroup_type"), //$NON-NLS-1$
 				OperationsPackage.Literals.MODEL_ELEMENT_GROUP__MODEL_ELEMENTS, true, false, true, null, null, null));
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java
index 3c37bcc..806f484 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeMoveOperationItemProvider.java
@@ -65,14 +65,13 @@
 	 * @generated
 	 */
 	protected void addOldIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeMoveOperation_oldIndex_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__OLD_INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeMoveOperation_oldIndex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__OLD_INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -82,14 +81,13 @@
 	 * @generated
 	 */
 	protected void addNewIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeMoveOperation_newIndex_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__NEW_INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeMoveOperation_newIndex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__NEW_INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,14 +97,13 @@
 	 * @generated
 	 */
 	protected void addReferencedValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeMoveOperation_referencedValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
-				"_UI_MultiAttributeMoveOperation_referencedValue_feature", "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__REFERENCED_VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeMoveOperation_referencedValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+					"_UI_MultiAttributeMoveOperation_referencedValue_feature", "_UI_MultiAttributeMoveOperation_type"), //$NON-NLS-1$ //$NON-NLS-2$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_MOVE_OPERATION__REFERENCED_VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java
index 7d45a23..7bd22c1 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeOperationItemProvider.java
@@ -66,14 +66,13 @@
 	 * @generated
 	 */
 	protected void addAddPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeOperation_add_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__ADD, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeOperation_add_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__ADD, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,14 +82,13 @@
 	 * @generated
 	 */
 	protected void addIndexesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeOperation_indexes_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_indexes_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__INDEXES, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeOperation_indexes_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_indexes_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__INDEXES, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -100,14 +98,13 @@
 	 * @generated
 	 */
 	protected void addReferencedValuesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeOperation_referencedValues_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_referencedValues_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__REFERENCED_VALUES, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeOperation_referencedValues_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeOperation_referencedValues_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_OPERATION__REFERENCED_VALUES, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java
index 36ba2f1..708810a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiAttributeSetOperationItemProvider.java
@@ -65,14 +65,13 @@
 	 * @generated
 	 */
 	protected void addIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeSetOperation_index_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeSetOperation_index_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -82,14 +81,13 @@
 	 * @generated
 	 */
 	protected void addOldValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeSetOperation_oldValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__OLD_VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeSetOperation_oldValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__OLD_VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,14 +97,13 @@
 	 * @generated
 	 */
 	protected void addNewValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiAttributeSetOperation_newValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__NEW_VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiAttributeSetOperation_newValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiAttributeSetOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiAttributeSetOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_ATTRIBUTE_SET_OPERATION__NEW_VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java
index 5df909d..b14fdfa 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceMoveOperationItemProvider.java
@@ -66,14 +66,13 @@
 	 * @generated
 	 */
 	protected void addOldIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiReferenceMoveOperation_oldIndex_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__OLD_INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiReferenceMoveOperation_oldIndex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_oldIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__OLD_INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,14 +82,13 @@
 	 * @generated
 	 */
 	protected void addNewIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiReferenceMoveOperation_newIndex_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__NEW_INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiReferenceMoveOperation_newIndex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceMoveOperation_newIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__NEW_INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -100,15 +98,14 @@
 	 * @generated
 	 */
 	protected void addReferencedModelElementIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiReferenceMoveOperation_referencedModelElementId_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
-				"_UI_MultiReferenceMoveOperation_referencedModelElementId_feature", //$NON-NLS-1$
-				"_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, true, false, true,
-			null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiReferenceMoveOperation_referencedModelElementId_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+					"_UI_MultiReferenceMoveOperation_referencedModelElementId_feature", //$NON-NLS-1$
+					"_UI_MultiReferenceMoveOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_REFERENCE_MOVE_OPERATION__REFERENCED_MODEL_ELEMENT_ID, true, false,
+				true, null, null, null));
 	}
 
 	// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java
index 0ec4303..63dcee3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceOperationItemProvider.java
@@ -69,14 +69,13 @@
 	 * @generated
 	 */
 	protected void addAddPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiReferenceOperation_add_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__ADD, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiReferenceOperation_add_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_add_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__ADD, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,14 +85,13 @@
 	 * @generated
 	 */
 	protected void addIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiReferenceOperation_index_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiReferenceOperation_index_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -156,7 +154,8 @@
 
 			final String elemNames = getModelElementClassesAndNames(op.getReferencedModelElements(), featureType);
 			final String elementNameAndClass = getModelElementClassAndName(op.getModelElementId());
-			final String children = op.getReferencedModelElements().size() > 1 ? Messages.MultiReferenceOperationItemProvider_Children
+			final String children = op.getReferencedModelElements().size() > 1
+				? Messages.MultiReferenceOperationItemProvider_Children
 				: Messages.MultiReferenceOperationItemProvider_Child;
 
 			final boolean isAdd = op.isAdd();
@@ -214,9 +213,9 @@
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__REFERENCED_MODEL_ELEMENTS,
-			ModelFactory.eINSTANCE.createModelElementId()));
+		newChildDescriptors
+			.add(createChildParameter(OperationsPackage.Literals.MULTI_REFERENCE_OPERATION__REFERENCED_MODEL_ELEMENTS,
+				ModelFactory.eINSTANCE.createModelElementId()));
 	}
 
 }
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java
index 3aee8a3..a4c6ea4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/MultiReferenceSetOperationItemProvider.java
@@ -65,14 +65,13 @@
 	 * @generated
 	 */
 	protected void addIndexPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_MultiReferenceSetOperation_index_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_MultiReferenceSetOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__INDEX, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_MultiReferenceSetOperation_index_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_MultiReferenceSetOperation_index_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_MultiReferenceSetOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__INDEX, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -167,13 +166,13 @@
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__OLD_VALUE,
-			ModelFactory.eINSTANCE.createModelElementId()));
+		newChildDescriptors
+			.add(createChildParameter(OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__OLD_VALUE,
+				ModelFactory.eINSTANCE.createModelElementId()));
 
-		newChildDescriptors.add(createChildParameter(
-			OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__NEW_VALUE,
-			ModelFactory.eINSTANCE.createModelElementId()));
+		newChildDescriptors
+			.add(createChildParameter(OperationsPackage.Literals.MULTI_REFERENCE_SET_OPERATION__NEW_VALUE,
+				ModelFactory.eINSTANCE.createModelElementId()));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java
index ef1cdda..a3eaf5e 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationGroupItemProvider.java
@@ -85,14 +85,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_OperationGroup_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_name_feature", //$NON-NLS-2$ //$NON-NLS-1$
-				"_UI_OperationGroup_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.OPERATION_GROUP__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_OperationGroup_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_OperationGroup_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.OPERATION_GROUP__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -102,12 +101,12 @@
 	 * @generated
 	 */
 	protected void addOperationsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_OperationGroup_operations_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_operations_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_OperationGroup_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.OPERATION_GROUP__OPERATIONS, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_OperationGroup_operations_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_OperationGroup_operations_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_OperationGroup_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.OPERATION_GROUP__OPERATIONS, true, false, true, null, null, null));
 	}
 
 	// BEGIN OF CUSTOM CODE
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java
index 1473067..229bf30 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/OperationsItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class OperationsItemProviderAdapterFactory extends OperationsAdapterFactory implements
-	ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class OperationsItemProviderAdapterFactory extends OperationsAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java
index d5a8554..7b6f548 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/ReferenceOperationItemProvider.java
@@ -66,14 +66,13 @@
 	 * @generated
 	 */
 	protected void addBidirectionalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ReferenceOperation_bidirectional_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_bidirectional_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.REFERENCE_OPERATION__BIDIRECTIONAL, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReferenceOperation_bidirectional_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_bidirectional_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.REFERENCE_OPERATION__BIDIRECTIONAL, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -83,14 +82,13 @@
 	 * @generated
 	 */
 	protected void addOppositeFeatureNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ReferenceOperation_oppositeFeatureName_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_oppositeFeatureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.REFERENCE_OPERATION__OPPOSITE_FEATURE_NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReferenceOperation_oppositeFeatureName_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_oppositeFeatureName_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.REFERENCE_OPERATION__OPPOSITE_FEATURE_NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -100,14 +98,13 @@
 	 * @generated
 	 */
 	protected void addContainmentTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ReferenceOperation_containmentType_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_containmentType_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_ReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.REFERENCE_OPERATION__CONTAINMENT_TYPE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ReferenceOperation_containmentType_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ReferenceOperation_containmentType_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.REFERENCE_OPERATION__CONTAINMENT_TYPE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java
index 6e5d997..1fded29 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/provider/SingleReferenceOperationItemProvider.java
@@ -64,12 +64,12 @@
 	 * @generated
 	 */
 	protected void addOldValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_SingleReferenceOperation_oldValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__OLD_VALUE, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SingleReferenceOperation_oldValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_oldValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__OLD_VALUE, true, false, true, null, null, null));
 	}
 
 	/**
@@ -79,12 +79,12 @@
 	 * @generated
 	 */
 	protected void addNewValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_SingleReferenceOperation_newValue_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
-			OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__NEW_VALUE, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_SingleReferenceOperation_newValue_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_SingleReferenceOperation_newValue_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_SingleReferenceOperation_type"), //$NON-NLS-1$
+				OperationsPackage.Literals.SINGLE_REFERENCE_OPERATION__NEW_VALUE, true, false, true, null, null, null));
 	}
 
 	// begin of custom code
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java
index 0d6155f..cd417f4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/provider/SemanticItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class SemanticItemProviderAdapterFactory extends SemanticAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable {
+public class SemanticItemProviderAdapterFactory extends SemanticAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java
index c7d5683..c9ff7c3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/BranchInfoItemProvider.java
@@ -38,8 +38,8 @@
  *
  * @generated
  */
-public class BranchInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class BranchInfoItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -74,13 +74,12 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_BranchInfo_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_BranchInfo_name_feature", "_UI_BranchInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.BRANCH_INFO__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_BranchInfo_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_BranchInfo_name_feature", "_UI_BranchInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				VersioningPackage.Literals.BRANCH_INFO__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java
index 9c948ea..6e308ee 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageEnvelopeItemProvider.java
@@ -39,8 +39,8 @@
  *
  * @generated
  */
-public class ChangePackageEnvelopeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ChangePackageEnvelopeItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 
 	/**
 	 * This constructs an instance from a factory and a notifier.
@@ -80,12 +80,10 @@
 	 */
 	protected void addFragmentIndexPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ChangePackageEnvelope_fragmentIndex_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentIndex_feature", "_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ChangePackageEnvelope_fragmentIndex_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentIndex_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.CHANGE_PACKAGE_ENVELOPE__FRAGMENT_INDEX, true, false, false,
 				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
@@ -99,12 +97,10 @@
 	 */
 	protected void addFragmentCountPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_ChangePackageEnvelope_fragmentCount_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentCount_feature", "_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ChangePackageEnvelope_fragmentCount_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ChangePackageEnvelope_fragmentCount_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ChangePackageEnvelope_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.CHANGE_PACKAGE_ENVELOPE__FRAGMENT_COUNT, true, false, false,
 				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java
index 9f80e55..c170d8b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageItemProvider.java
@@ -39,8 +39,8 @@
  *
  * @generated
  */
-public class ChangePackageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ChangePackageItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java
index 3dec8bb..9f1010b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/ChangePackageProxyItemProvider.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class ChangePackageProxyItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class ChangePackageProxyItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -79,12 +79,10 @@
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-		.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_ChangePackageProxy_id_feature"), //$NON-NLS-1$
-			getString(
-				"_UI_PropertyDescriptor_description", "_UI_ChangePackageProxy_id_feature", "_UI_ChangePackageProxy_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_ChangePackageProxy_id_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_ChangePackageProxy_id_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_ChangePackageProxy_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.CHANGE_PACKAGE_PROXY__ID, true, false, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java
index e5df5cf..0b130ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/DateVersionSpecItemProvider.java
@@ -64,14 +64,13 @@
 	 * @generated
 	 */
 	protected void addDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_DateVersionSpec_date_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_DateVersionSpec_date_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_DateVersionSpec_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.DATE_VERSION_SPEC__DATE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_DateVersionSpec_date_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_DateVersionSpec_date_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_DateVersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.DATE_VERSION_SPEC__DATE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java
index fa790c4..8137571 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/FileBasedChangePackageItemProvider.java
@@ -39,8 +39,8 @@
  *
  * @generated
  */
-public class FileBasedChangePackageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class FileBasedChangePackageItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
@@ -78,12 +78,10 @@
 	 */
 	protected void addFilePathPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_FileBasedChangePackage_filePath_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_FileBasedChangePackage_filePath_feature", "_UI_FileBasedChangePackage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_FileBasedChangePackage_filePath_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_FileBasedChangePackage_filePath_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_FileBasedChangePackage_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.FILE_BASED_CHANGE_PACKAGE__FILE_PATH, true, false, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -186,9 +184,9 @@
 		newChildDescriptors.add(createChildParameter(VersioningPackage.Literals.ABSTRACT_CHANGE_PACKAGE__LOG_MESSAGE,
 			VersioningFactory.eINSTANCE.createLogMessage()));
 
-		newChildDescriptors.add(createChildParameter(
-			VersioningPackage.Literals.FILE_BASED_CHANGE_PACKAGE__OPERATION_PROXIES,
-			VersioningFactory.eINSTANCE.createOperationProxy()));
+		newChildDescriptors
+			.add(createChildParameter(VersioningPackage.Literals.FILE_BASED_CHANGE_PACKAGE__OPERATION_PROXIES,
+				VersioningFactory.eINSTANCE.createOperationProxy()));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java
index f9f7792..47eb1ac 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryInfoItemProvider.java
@@ -41,8 +41,8 @@
  *
  * @generated
  */
-public class HistoryInfoItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class HistoryInfoItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -92,13 +92,12 @@
 	 * @generated
 	 */
 	protected void addLogMessagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_HistoryInfo_logMessage_feature"), //$NON-NLS-1$
-			getString(
-				"_UI_PropertyDescriptor_description", "_UI_HistoryInfo_logMessage_feature", "_UI_HistoryInfo_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.HISTORY_INFO__LOG_MESSAGE, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_HistoryInfo_logMessage_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HistoryInfo_logMessage_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HistoryInfo_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.HISTORY_INFO__LOG_MESSAGE, true, false, true, null, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java
index f82a773..4066c6c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/HistoryQueryItemProvider.java
@@ -36,8 +36,8 @@
  *
  * @generated
  */
-public class HistoryQueryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class HistoryQueryItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -73,12 +73,12 @@
 	 * @generated
 	 */
 	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_HistoryQuery_source_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_source_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_HistoryQuery_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.HISTORY_QUERY__SOURCE, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_HistoryQuery_source_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_source_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HistoryQuery_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.HISTORY_QUERY__SOURCE, true, false, true, null, null, null));
 	}
 
 	/**
@@ -88,14 +88,13 @@
 	 * @generated
 	 */
 	protected void addIncludeChangePackagesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_HistoryQuery_includeChangePackages_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeChangePackages_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_HistoryQuery_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_CHANGE_PACKAGES, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_HistoryQuery_includeChangePackages_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeChangePackages_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HistoryQuery_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_CHANGE_PACKAGES, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -105,14 +104,13 @@
 	 * @generated
 	 */
 	protected void addIncludeAllVersionsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_HistoryQuery_includeAllVersions_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeAllVersions_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_HistoryQuery_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_ALL_VERSIONS, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_HistoryQuery_includeAllVersions_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_HistoryQuery_includeAllVersions_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_HistoryQuery_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.HISTORY_QUERY__INCLUDE_ALL_VERSIONS, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java
index 45399c2..86dee87 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/LogMessageItemProvider.java
@@ -36,8 +36,8 @@
  *
  * @generated
  */
-public class LogMessageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,
-	ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class LogMessageItemProvider extends ItemProviderAdapter
+	implements IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -74,13 +74,13 @@
 	 * @generated
 	 */
 	protected void addMessagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_LogMessage_message_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_message_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.LOG_MESSAGE__MESSAGE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_LogMessage_message_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_message_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_LogMessage_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.LOG_MESSAGE__MESSAGE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -91,13 +91,12 @@
 	 * @generated
 	 */
 	protected void addDatePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_LogMessage_date_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_date_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.LOG_MESSAGE__DATE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_LogMessage_date_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_date_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				VersioningPackage.Literals.LOG_MESSAGE__DATE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -108,12 +107,10 @@
 	 */
 	protected void addClientDatePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_LogMessage_clientDate_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_LogMessage_clientDate_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_LogMessage_clientDate_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_clientDate_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_LogMessage_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.LOG_MESSAGE__CLIENT_DATE, true, false, false,
 				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
@@ -125,13 +122,12 @@
 	 * @generated
 	 */
 	protected void addAuthorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_LogMessage_author_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_author_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.LOG_MESSAGE__AUTHOR, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_LogMessage_author_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_LogMessage_author_feature", "_UI_LogMessage_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				VersioningPackage.Literals.LOG_MESSAGE__AUTHOR, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java
index 53555e7..505fa1a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PagedUpdateVersionSpecItemProvider.java
@@ -68,14 +68,13 @@
 	 * @generated
 	 */
 	protected void addMaxChangesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_PagedUpdateVersionSpec_maxChanges_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_maxChanges_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__MAX_CHANGES, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_PagedUpdateVersionSpec_maxChanges_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_maxChanges_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__MAX_CHANGES, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -86,14 +85,13 @@
 	 * @generated
 	 */
 	protected void addBaseVersionSpecPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_PagedUpdateVersionSpec_baseVersionSpec_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_baseVersionSpec_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__BASE_VERSION_SPEC, true, false, true, null, null,
-			null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_PagedUpdateVersionSpec_baseVersionSpec_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_PagedUpdateVersionSpec_baseVersionSpec_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_PagedUpdateVersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.PAGED_UPDATE_VERSION_SPEC__BASE_VERSION_SPEC, true, false, true, null, null,
+				null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java
index 7a53f25..ba5eb15 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/PrimaryVersionSpecItemProvider.java
@@ -64,14 +64,13 @@
 	 * @generated
 	 */
 	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_PrimaryVersionSpec_identifier_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_identifier_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.PRIMARY_VERSION_SPEC__IDENTIFIER, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_PrimaryVersionSpec_identifier_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_identifier_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.PRIMARY_VERSION_SPEC__IDENTIFIER, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -82,14 +81,13 @@
 	 * @generated
 	 */
 	protected void addProjectStateChecksumPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_PrimaryVersionSpec_projectStateChecksum_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_projectStateChecksum_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.PRIMARY_VERSION_SPEC__PROJECT_STATE_CHECKSUM, true, false, false,
-			ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_PrimaryVersionSpec_projectStateChecksum_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_PrimaryVersionSpec_projectStateChecksum_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_PrimaryVersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.PRIMARY_VERSION_SPEC__PROJECT_STATE_CHECKSUM, true, false, false,
+				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java
index 7147bdb..59958ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/RangeQueryItemProvider.java
@@ -67,12 +67,10 @@
 	 */
 	protected void addUpperLimitPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_RangeQuery_upperLimit_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_RangeQuery_upperLimit_feature", "_UI_RangeQuery_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RangeQuery_upperLimit_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_upperLimit_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_RangeQuery_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.RANGE_QUERY__UPPER_LIMIT, true, false, false,
 				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
@@ -85,12 +83,10 @@
 	 */
 	protected void addLowerLimitPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add(createItemPropertyDescriptor(
-				((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_RangeQuery_lowerLimit_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_RangeQuery_lowerLimit_feature", "_UI_RangeQuery_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RangeQuery_lowerLimit_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_lowerLimit_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_RangeQuery_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.RANGE_QUERY__LOWER_LIMIT, true, false, false,
 				ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE, null, null));
 	}
@@ -102,14 +98,13 @@
 	 * @generated
 	 */
 	protected void addIncludeIncomingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_RangeQuery_includeIncoming_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeIncoming_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_RangeQuery_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.RANGE_QUERY__INCLUDE_INCOMING, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RangeQuery_includeIncoming_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeIncoming_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_RangeQuery_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.RANGE_QUERY__INCLUDE_INCOMING, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -119,14 +114,13 @@
 	 * @generated
 	 */
 	protected void addIncludeOutgoingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_RangeQuery_includeOutgoing_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeOutgoing_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_RangeQuery_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.RANGE_QUERY__INCLUDE_OUTGOING, true, false, false,
-			ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_RangeQuery_includeOutgoing_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_RangeQuery_includeOutgoing_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_RangeQuery_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.RANGE_QUERY__INCLUDE_OUTGOING, true, false, false,
+				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -149,7 +143,7 @@
 	 */
 	@Override
 	public String getText(Object object) {
-		final RangeQuery<?> rangeQuery = (RangeQuery<?>) object;
+		final RangeQuery rangeQuery = (RangeQuery) object;
 		return getString("_UI_RangeQuery_type") + " " + rangeQuery.isIncludeChangePackages(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java
index 8f71181..1b17a58 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/TagVersionSpecItemProvider.java
@@ -64,14 +64,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_TagVersionSpec_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_TagVersionSpec_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_TagVersionSpec_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.TAG_VERSION_SPEC__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_TagVersionSpec_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_TagVersionSpec_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_TagVersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.TAG_VERSION_SPEC__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java
index 1963c6e..2390174 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionItemProvider.java
@@ -77,11 +77,11 @@
 	 * @generated
 	 */
 	protected void addNextVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_Version_nextVersion_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_Version_nextVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.VERSION__NEXT_VERSION, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Version_nextVersion_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Version_nextVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				VersioningPackage.Literals.VERSION__NEXT_VERSION, true, false, true, null, null, null));
 	}
 
 	/**
@@ -91,11 +91,12 @@
 	 * @generated
 	 */
 	protected void addPreviousVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_Version_previousVersion_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_Version_previousVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.VERSION__PREVIOUS_VERSION, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Version_previousVersion_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Version_previousVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Version_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.VERSION__PREVIOUS_VERSION, true, false, true, null, null, null));
 	}
 
 	/**
@@ -105,11 +106,12 @@
 	 * @generated
 	 */
 	protected void addAncestorVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_Version_ancestorVersion_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_Version_ancestorVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.VERSION__ANCESTOR_VERSION, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Version_ancestorVersion_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Version_ancestorVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Version_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.VERSION__ANCESTOR_VERSION, true, false, true, null, null, null));
 	}
 
 	/**
@@ -121,10 +123,9 @@
 	protected void addBranchedVersionsPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_Version_branchedVersions_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Version_branchedVersions_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getResourceLocator(), getString("_UI_Version_branchedVersions_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Version_branchedVersions_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Version_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.VERSION__BRANCHED_VERSIONS, true, false, true, null, null, null));
 	}
 
@@ -135,11 +136,12 @@
 	 * @generated
 	 */
 	protected void addMergedToVersionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-			getString("_UI_Version_mergedToVersion_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_Version_mergedToVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.VERSION__MERGED_TO_VERSION, true, false, true, null, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_Version_mergedToVersion_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Version_mergedToVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Version_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.VERSION__MERGED_TO_VERSION, true, false, true, null, null, null));
 	}
 
 	/**
@@ -151,10 +153,9 @@
 	protected void addMergedFromVersionPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
 			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-				getResourceLocator(),
-				getString("_UI_Version_mergedFromVersion_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_Version_mergedFromVersion_feature", "_UI_Version_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getResourceLocator(), getString("_UI_Version_mergedFromVersion_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_Version_mergedFromVersion_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_Version_type"), //$NON-NLS-1$
 				VersioningPackage.Literals.VERSION__MERGED_FROM_VERSION, true, false, true, null, null, null));
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java
index 1425ef6..3d4db95 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionPropertyItemProvider.java
@@ -73,14 +73,13 @@
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_VersionProperty_name_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_VersionProperty_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.VERSION_PROPERTY__NAME, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_VersionProperty_name_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_name_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_VersionProperty_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.VERSION_PROPERTY__NAME, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -90,14 +89,13 @@
 	 * @generated
 	 */
 	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_VersionProperty_value_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
-				"_UI_VersionProperty_type"), //$NON-NLS-1$
-			VersioningPackage.Literals.VERSION_PROPERTY__VALUE, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_VersionProperty_value_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_VersionProperty_value_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_VersionProperty_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.VERSION_PROPERTY__VALUE, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java
index 41cb094..8d57651 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersionSpecItemProvider.java
@@ -71,13 +71,13 @@
 	 * @generated
 	 */
 	protected void addBranchPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(
-			((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
-			getResourceLocator(),
-			getString("_UI_VersionSpec_branch_feature"), //$NON-NLS-1$
-			getString("_UI_PropertyDescriptor_description", "_UI_VersionSpec_branch_feature", "_UI_VersionSpec_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			VersioningPackage.Literals.VERSION_SPEC__BRANCH, true, false, false,
-			ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+				getResourceLocator(), getString("_UI_VersionSpec_branch_feature"), //$NON-NLS-1$
+				getString("_UI_PropertyDescriptor_description", "_UI_VersionSpec_branch_feature", //$NON-NLS-1$ //$NON-NLS-2$
+					"_UI_VersionSpec_type"), //$NON-NLS-1$
+				VersioningPackage.Literals.VERSION_SPEC__BRANCH, true, false, false,
+				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java
index 6127095..25ba726 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model.edit/src/org/eclipse/emf/emfstore/internal/server/model/versioning/provider/VersioningItemProviderAdapterFactory.java
@@ -40,8 +40,8 @@
  *
  * @generated
  */
-public class VersioningItemProviderAdapterFactory extends VersioningAdapterFactory implements
-	ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class VersioningItemProviderAdapterFactory extends VersioningAdapterFactory
+	implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java
index a6f0ec2..7d6e052 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/AuthenticationInformation.java
@@ -18,18 +18,18 @@
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Authentication Information</b></em>'.
  *
- * @extends APIDelegate<ESGlobalProjectId><!-- end-user-doc --
+ * @extends APIDelegate<ESAuthenticationInformation><!-- end-user-doc --
  *          <!-- end-user-doc -->
  *
  *          <p>
  *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getSessionId <em>Session
- *          Id</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getResolvedACUser <em>
- *          Resolved AC User</em>}</li>
- *          </ul>
  *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getSessionId
+ *          <em>Session Id</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.AuthenticationInformation#getResolvedACUser
+ *          <em>Resolved AC User</em>}</li>
+ *          </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getAuthenticationInformation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java
index 820b22a..55ec193 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ClientVersionInfo.java
@@ -22,12 +22,12 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo#getVersion <em>Version</em>}
  *          </li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ClientVersionInfo#getName <em>Name</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getClientVersionInfo()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java
index 22514f7..e32fa9f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ModelPackage.java
@@ -1011,8 +1011,8 @@
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl
-		 * <em>Client Version Info</em>}' class.
+		 * {@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl <em>Client Version Info</em>
+		 * }' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
 		 *
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java
index 06f8512..027a00c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectHistory.java
@@ -26,26 +26,21 @@
  *
  *          <p>
  *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectId
- *          <em>Project Id</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getVersions
- *          <em>Versions</em>}</li>
- *          <li>
- *          {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectName
- *          <em>Project Name</em>}</li>
- *          <li>
- *          {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
- *          <em>Project Description</em>}</li>
- *          <li>
- *          {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getSharedProperties
- *          <em>Shared Properties</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getBranches
- *          <em>Branches</em>}</li>
- *          </ul>
  *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectId <em>Project Id</em>}
+ *          </li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getVersions <em>Versions</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectName
+ *          <em>Project Name</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
+ *          <em>Project Description</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getSharedProperties
+ *          <em>Shared Properties</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getBranches <em>Branches</em>}</li>
+ *          </ul>
  *
- * @see ModelPackage#getProjectHistory()
+ * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getProjectHistory()
  * @model
  * @generated
  */
@@ -152,8 +147,7 @@
 	String getProjectDescription();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.server.model.ProjectHistory#getProjectDescription
 	 * <em>Project Description</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java
index 00dece8..85bd8a8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectId.java
@@ -17,7 +17,7 @@
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>Project Id</b></em>'.
  *
- * @extends APIDelegate<ESGlobalProjectId><!-- end-user-doc -->
+ * @extends APIDelegate<ESGlobalProjectIdImpl><!-- end-user-doc -->
  *
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getProjectId()
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java
index 0e9f0b4..126c27b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ProjectInfo.java
@@ -20,13 +20,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getDescription <em>Description</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getProjectId <em>Project Id</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.ProjectInfo#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getProjectInfo()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java
index 3c7e108..b73c267 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/ServerSpace.java
@@ -27,14 +27,14 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getGroups <em>Groups</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getProjects <em>Projects</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getOpenSessions <em>Open Sessions
- *          </em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getOpenSessions <em>Open Sessions</em>
+ *          }</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.ServerSpace#getUsers <em>Users</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getServerSpace()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java
index cb6aa9c..bc1f919 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/VersionInfo.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString <em>Emf Store Version
- * String</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString
+ * <em>Emf Store Version String</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.ModelPackage#getVersionInfo()
  * @model
@@ -47,8 +47,7 @@
 	String getEmfStoreVersionString();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.server.model.VersionInfo#getEmfStoreVersionString
 	 * <em>Emf Store Version String</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java
index f23eab6..e61e047 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACGroup.java
@@ -16,16 +16,15 @@
 /**
  * <!-- begin-user-doc --> A representation of the model object ' <em><b>AC Group</b></em>'.
  *
- * @extends APIDelegate<ESGroup>
- *          <!-- end-user-doc -->
+ * <!-- end-user-doc -->
  *
- *          <p>
- *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACGroup#getMembers <em>Members</em>}
- *          </li>
- *          </ul>
- *          </p>
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACGroup#getMembers <em>Members</em>}
+ * </li>
+ * </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolPackage#getACGroup()
  * @model
@@ -47,7 +46,6 @@
 	 * @model keys="identifier"
 	 * @generated
 	 */
-	@SuppressWarnings("rawtypes")
 	EList<ACOrgUnit> getMembers();
 
 } // ACGroup
\ No newline at end of file
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java
index 617ded2..8b57e20 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/ACOrgUnit.java
@@ -24,23 +24,24 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getName <em>Name</em>}
  *          </li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getRoles <em>Roles</em>}
  *          </li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription <em>
- *          Description </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getProperties <em>
- *          Properties</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription
+ *          <em>Description</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getProperties
+ *          <em>Properties</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolPackage#getACOrgUnit()
  * @model
  * @generated
  */
 public interface ACOrgUnit<E extends ESOrgUnit> extends IdentifiableElement, APIDelegate<E> {
+
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!--
 	 * begin-user-doc -->
@@ -116,8 +117,8 @@
 
 	/**
 	 * Sets the value of the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription
-	 * <em>Description</em>}' attribute.
+	 * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription <em>Description</em>
+	 * }' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 *
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java
index f351ff7..f9235e6 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/AccesscontrolPackage.java
@@ -486,8 +486,8 @@
 
 	/**
 	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription
-	 * <em>Description</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.ACOrgUnit#getDescription <em>Description</em>
+	 * }'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @return the meta object for the attribute '<em>Description</em>'.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java
index c3cdf97..5574586 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/OrgUnitProperty.java
@@ -19,13 +19,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty#getValue <em>Value</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.OrgUnitProperty#getProject <em>Project</em>}
  * </li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.AccesscontrolPackage#getOrgUnitProperty()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java
index fec571b..a47cc12 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/ACGroupImpl.java
@@ -33,7 +33,7 @@
  *
  * @generated
  */
-public class ACGroupImpl extends ACOrgUnitImpl<ESGroup>implements ACGroup {
+public class ACGroupImpl extends ACOrgUnitImpl<ESGroup> implements ACGroup {
 
 	/**
 	 * @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java
index d4aa105..3e740b3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/AccesscontrolPackageImpl.java
@@ -452,9 +452,9 @@
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getACUser_LastName(), ecorePackage.getEString(), "lastName", null, 0, 1, ACUser.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getACUser_EffectiveGroups(), getACGroup(), null, "effectiveGroups", null, 0, -1, ACUser.class, //$NON-NLS-1$
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-			!IS_DERIVED, IS_ORDERED);
+		initEReference(getACUser_EffectiveGroups(), getACGroup(), null, "effectiveGroups", null, 0, -1, //$NON-NLS-1$
+			ACUser.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
+			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getACUser_Password(), ecorePackage.getEString(), "password", null, 0, 1, ACUser.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
@@ -475,9 +475,9 @@
 		addEOperation(acOrgUnitEClass, getACOrgUnitId(), "getId", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
 
 		initEClass(acGroupEClass, ACGroup.class, "ACGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
-		initEReference(getACGroup_Members(), getACOrgUnit(), null, "members", null, 0, -1, ACGroup.class, !IS_TRANSIENT, //$NON-NLS-1$
-			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
-			IS_ORDERED);
+		initEReference(getACGroup_Members(), getACOrgUnit(), null, "members", null, 0, -1, ACGroup.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 		getACGroup_Members().getEKeys().add(theModelPackage.getIdentifiableElement_Identifier());
 
 		initEClass(acOrgUnitIdEClass, ACOrgUnitId.class, "ACOrgUnitId", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java
index cd4b8ae..eb18c43 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/impl/OrgUnitPropertyImpl.java
@@ -29,15 +29,15 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getName <em>Name
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getValue <em>Value
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getProject <em>
- * Project</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getName
+ * <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getValue
+ * <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.impl.OrgUnitPropertyImpl#getProject
+ * <em>Project</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java
index 88a92e8..8b8b8b3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/Role.java
@@ -24,11 +24,11 @@
  *
  *          <p>
  *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role#getProjects <em>Projects
- *          </em>}</li>
- *          </ul>
  *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role#getProjects
+ *          <em>Projects</em>}</li>
+ *          </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.RolesPackage#getRole()
  * @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java
index ceb83bf..4d480bc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/RolesPackage.java
@@ -215,8 +215,8 @@
 	int SERVER_ADMIN_FEATURE_COUNT = ROLE_FEATURE_COUNT + 0;
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role <em>Role</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.Role
+	 * <em>Role</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
 	 * @return the meta object for class '<em>Role</em>'.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java
index 63f46e3..a488190 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ProjectAdminRoleImpl.java
@@ -19,8 +19,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Admin Role</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java
index 1ca57ff..408afb5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ReaderRoleImpl.java
@@ -18,8 +18,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Reader Role</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java
index 20c5b13..be152ac 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RoleImpl.java
@@ -30,11 +30,11 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Role</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.impl.RoleImpl#getProjects <em>Projects
- * </em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.impl.RoleImpl#getProjects
+ * <em>Projects</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java
index 15c3ee3..188226c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/RolesPackageImpl.java
@@ -110,8 +110,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link RolesPackage#eINSTANCE} when that field is accessed. Clients should not
-	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+	 * This method is used to initialize {@link RolesPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java
index e2d2020..2691de0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/ServerAdminImpl.java
@@ -18,8 +18,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Server Admin</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java
index d3a36f1..3ab2520 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/roles/impl/WriterRoleImpl.java
@@ -18,8 +18,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Writer Role</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java
index 5ffea03..4cd6649 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolAdapterFactory.java
@@ -86,7 +86,7 @@
 		}
 
 		@Override
-		public Adapter caseACOrgUnit(@SuppressWarnings("rawtypes") ACOrgUnit object) {
+		public Adapter caseACOrgUnit(ACOrgUnit object) {
 			return createACOrgUnitAdapter();
 		}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java
index 5d70b63..d27d472 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/accesscontrol/util/AccesscontrolSwitch.java
@@ -112,7 +112,6 @@
 			return result;
 		}
 		case AccesscontrolPackage.AC_ORG_UNIT: {
-			@SuppressWarnings("rawtypes")
 			final ACOrgUnit acOrgUnit = (ACOrgUnit) theEObject;
 			T result = caseACOrgUnit(acOrgUnit);
 			if (result == null) {
@@ -189,7 +188,7 @@
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
-	public T caseACOrgUnit(@SuppressWarnings("rawtypes") ACOrgUnit object) {
+	public T caseACOrgUnit(ACOrgUnit object) {
 		return null;
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java
index e233c3f..adc4411 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/AuthenticationInformationImpl.java
@@ -27,13 +27,13 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getSessionId <em>Session
- * Id</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getResolvedACUser <em>
- * Resolved AC User</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getSessionId
+ * <em>Session Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.AuthenticationInformationImpl#getResolvedACUser
+ * <em>Resolved AC User</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java
index 2dfe6fd..3d91ae3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ClientVersionInfoImpl.java
@@ -24,12 +24,12 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl#getVersion <em>Version</em>}
  * </li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ClientVersionInfoImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java
index 8238341..5c09170 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/FileIdentifierImpl.java
@@ -21,8 +21,6 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>File Identifier</b></em>'.
  *
  * @implements Serializable <!-- end-user-doc -->
- *             <p>
- *             </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java
index 1fae6b1..0902e07 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ModelPackageImpl.java
@@ -142,8 +142,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed. Clients should not
-	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+	 * This method is used to initialize {@link ModelPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
@@ -604,8 +605,8 @@
 		initEAttribute(getProjectHistory_ProjectName(), ecorePackage.getEString(), "projectName", null, 1, 1, //$NON-NLS-1$
 			ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getProjectHistory_ProjectDescription(), ecorePackage.getEString(), "projectDescription", null, //$NON-NLS-1$
-			1, 1, ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getProjectHistory_ProjectDescription(), ecorePackage.getEString(), "projectDescription", null, 1, //$NON-NLS-1$
+			1, ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 		initEReference(getProjectHistory_SharedProperties(), theModelPackage_1.getEMFStoreProperty(), null,
 			"sharedProperties", null, 0, -1, ProjectHistory.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
@@ -624,8 +625,8 @@
 		initEReference(getProjectInfo_ProjectId(), getProjectId(), null, "projectId", null, 1, 1, //$NON-NLS-1$
 			ProjectInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getProjectInfo_Version(), theVersioningPackage.getPrimaryVersionSpec(), null, "version", null, //$NON-NLS-1$
-			1, 1, ProjectInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+		initEReference(getProjectInfo_Version(), theVersioningPackage.getPrimaryVersionSpec(), null, "version", null, 1, //$NON-NLS-1$
+			1, ProjectInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(sessionIdEClass, SessionId.class, "SessionId", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
@@ -651,9 +652,9 @@
 
 		initEClass(versionInfoEClass, VersionInfo.class, "VersionInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
 			IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getVersionInfo_EmfStoreVersionString(), ecorePackage.getEString(), "emfStoreVersionString", //$NON-NLS-1$
-			null, 0, 1, VersionInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getVersionInfo_EmfStoreVersionString(), ecorePackage.getEString(), "emfStoreVersionString", null, //$NON-NLS-1$
+			0, 1, VersionInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
 
 		initEClass(clientVersionInfoEClass, ClientVersionInfo.class, "ClientVersionInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
 			IS_GENERATED_INSTANCE_CLASS);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java
index 36d3d2d..1fad9ef 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectIdImpl.java
@@ -18,8 +18,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Id</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java
index 44678d2..a9a2841 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ProjectInfoImpl.java
@@ -26,6 +26,7 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Info</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getDescription <em>Description</em>}
@@ -33,7 +34,6 @@
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getProjectId <em>Project Id</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ProjectInfoImpl#getVersion <em>Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java
index be09926..ee25d25 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/ServerSpaceImpl.java
@@ -38,16 +38,16 @@
  * 			<!-- end-user-doc -->
  *          <p>
  *          The following features are implemented:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getGroups <em>Groups</em>}
  *          </li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getProjects <em>Projects
- *          </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getOpenSessions <em>Open
- *          Sessions </em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getProjects <em>Projects</em>
+ *          }</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getOpenSessions
+ *          <em>Open Sessions</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.ServerSpaceImpl#getUsers <em>Users</em>}</li>
  *          </ul>
- *          </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java
index d680bf3..9d1321b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/VersionInfoImpl.java
@@ -22,11 +22,11 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Version Info</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.VersionInfoImpl#getEmfStoreVersionString <em>Emf Store
- * Version String</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.impl.VersionInfoImpl#getEmfStoreVersionString
+ * <em>Emf Store Version String</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java
index 0d94dc5..48ac76e 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESBranchInfoImpl.java
@@ -22,7 +22,7 @@
  * @author emueller
  *
  */
-public class ESBranchInfoImpl extends AbstractAPIImpl<ESBranchInfo, BranchInfo>implements ESBranchInfo {
+public class ESBranchInfoImpl extends AbstractAPIImpl<ESBranchInfo, BranchInfo> implements ESBranchInfo {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java
index a2a6423..3e3854a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESChangePackageImpl.java
@@ -31,7 +31,7 @@
  * @author emueller
  *
  */
-public class ESChangePackageImpl extends ESAbstractChangePackageImpl<ChangePackage>implements ESChangePackage {
+public class ESChangePackageImpl extends ESAbstractChangePackageImpl<ChangePackage> implements ESChangePackage {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java
index 28d374a..93bccad 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESHistoryInfoImpl.java
@@ -29,7 +29,7 @@
  *
  * @author emueller
  */
-public class ESHistoryInfoImpl extends AbstractAPIImpl<ESHistoryInfo, HistoryInfo>implements ESHistoryInfo {
+public class ESHistoryInfoImpl extends AbstractAPIImpl<ESHistoryInfo, HistoryInfo> implements ESHistoryInfo {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java
index 12c9a0b..bc8946f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESLogMessageImpl.java
@@ -23,7 +23,7 @@
  * @author emueller
  *
  */
-public class ESLogMessageImpl extends AbstractAPIImpl<ESLogMessage, LogMessage>implements ESLogMessage {
+public class ESLogMessageImpl extends AbstractAPIImpl<ESLogMessage, LogMessage> implements ESLogMessage {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java
index f413cce..e055fd0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOperationImpl.java
@@ -19,7 +19,7 @@
  * Mapping between {@link ESOperation} and {@link AbstractOperation}.
  *
  */
-public class ESOperationImpl extends AbstractAPIImpl<ESOperation, AbstractOperation>implements ESOperation {
+public class ESOperationImpl extends AbstractAPIImpl<ESOperation, AbstractOperation> implements ESOperation {
 
 	/**
 	 * Constructs a new {@link ESOperation} by wrapping an internal operation type.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java
index 1a38889..fd625ea 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESOrgUnitIdImpl.java
@@ -21,7 +21,7 @@
  * @author emueller
  *
  */
-public class ESOrgUnitIdImpl extends AbstractAPIImpl<ESOrgUnitIdImpl, ACOrgUnitId>implements ESOrgUnitId {
+public class ESOrgUnitIdImpl extends AbstractAPIImpl<ESOrgUnitIdImpl, ACOrgUnitId> implements ESOrgUnitId {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java
index a699283..f6ed9e7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESProjectHistoryImpl.java
@@ -21,7 +21,8 @@
  * @author emueller
  *
  */
-public class ESProjectHistoryImpl extends AbstractAPIImpl<ESProjectHistory, ProjectHistory>implements ESProjectHistory {
+public class ESProjectHistoryImpl extends AbstractAPIImpl<ESProjectHistory, ProjectHistory>
+	implements ESProjectHistory {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java
index 1ca92e9..b446277 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESRoleImpl.java
@@ -21,7 +21,7 @@
  * @author emueller
  *
  */
-public class ESRoleImpl extends AbstractAPIImpl<ESRole, Role>implements ESRole {
+public class ESRoleImpl extends AbstractAPIImpl<ESRole, Role> implements ESRole {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java
index 1b8d864..460e283 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/ESSessionIdImpl.java
@@ -21,7 +21,7 @@
  * @author emueller
  *
  */
-public class ESSessionIdImpl extends AbstractAPIImpl<ESSessionIdImpl, SessionId>implements ESSessionId {
+public class ESSessionIdImpl extends AbstractAPIImpl<ESSessionIdImpl, SessionId> implements ESSessionId {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java
index 092a35a..fe68a32 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESHistoryQueryImpl.java
@@ -24,7 +24,7 @@
  * @param <T> a subtype of the internal type {@link HistoryQuery}
  */
 public abstract class ESHistoryQueryImpl<U extends ESHistoryQuery<?>, T extends HistoryQuery<U>>
-	extends AbstractAPIImpl<U, T>implements ESHistoryQuery<U> {
+	extends AbstractAPIImpl<U, T> implements ESHistoryQuery<U> {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java
index e4163d1..2025e0f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/query/ESPathQueryImpl.java
@@ -29,7 +29,7 @@
  * @author wesendon
  * @author emueller
  */
-public class ESPathQueryImpl extends ESHistoryQueryImpl<ESPathQuery, PathQuery>implements ESPathQuery {
+public class ESPathQueryImpl extends ESHistoryQueryImpl<ESPathQuery, PathQuery> implements ESPathQuery {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java
index 9a88e5f..83feb71 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/impl/api/versionspec/ESVersionSpecImpl.java
@@ -25,7 +25,7 @@
  * @param <T> a subtype of the internal type {@link VersionSpec}
  */
 public class ESVersionSpecImpl<U extends ESVersionSpec, T extends VersionSpec & APIDelegate<U>>
-	extends AbstractAPIImpl<U, T>implements ESVersionSpec {
+	extends AbstractAPIImpl<U, T> implements ESVersionSpec {
 
 	/**
 	 * Constructor.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java
index afabaf5..da6e161 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ModelElementUrlFragment.java
@@ -19,12 +19,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ModelElementUrlFragment#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ModelElementUrlFragment#getModelElementId <em>Model
- * Element Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ModelElementUrlFragment#getModelElementId
+ * <em>Model Element Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.url.UrlPackage#getModelElementUrlFragment()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java
index 4e38a3f..e523332 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ProjectUrlFragment.java
@@ -19,12 +19,12 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ProjectUrlFragment#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ProjectUrlFragment#getProjectId <em>Project Id</em>}
  * </li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.url.UrlPackage#getProjectUrlFragment()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java
index 3f44785..61f5105 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/ServerUrl.java
@@ -17,11 +17,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl#getHostName <em>Host Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl#getPort <em>Port</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.url.UrlPackage#getServerUrl()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java
index 17fcd3f..8bc0d90 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/UrlPackage.java
@@ -103,8 +103,7 @@
 	int SERVER_URL_FEATURE_COUNT = 2;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl
 	 * <em>Project Url Fragment</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
@@ -416,8 +415,8 @@
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl <em>Server Url</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl
+		 * <em>Server Url</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
 		 *
@@ -505,8 +504,8 @@
 
 		/**
 		 * The meta object literal for the '
-		 * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlImpl
-		 * <em>Model Element Url</em>}' class.
+		 * {@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlImpl <em>Model Element Url</em>
+		 * }' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
 		 *
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java
index b4f70b8..7599f94 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ModelElementUrlFragmentImpl.java
@@ -25,13 +25,13 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlFragmentImpl#getName <em>Name</em>}
  * </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlFragmentImpl#getModelElementId <em>
- * Model Element Id</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ModelElementUrlFragmentImpl#getModelElementId
+ * <em>Model Element Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java
index a124651..ca0510c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ProjectUrlFragmentImpl.java
@@ -25,12 +25,12 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl#getName <em>Name</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl#getProjectId <em>Project Id
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ProjectUrlFragmentImpl#getProjectId
+ * <em>Project Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java
index 7c5380d..7ee0491 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/ServerUrlImpl.java
@@ -21,11 +21,11 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Server Url</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl#getHostName <em>Host Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.url.impl.ServerUrlImpl#getPort <em>Port</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java
index 58c683b..8ee5722 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/impl/UrlPackageImpl.java
@@ -102,8 +102,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link UrlPackage#eINSTANCE} when that field is accessed. Clients should not
-	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+	 * This method is used to initialize {@link UrlPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java
index bd8d062..abab978 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/url/util/UrlAdapterFactory.java
@@ -118,8 +118,8 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl <em>Server Url</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.internal.server.model.url.ServerUrl
+	 * <em>Server Url</em>}'.
 	 * <!-- begin-user-doc --> This default
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java
index c9d820c..d62e592 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AbstractChangePackage.java
@@ -27,11 +27,11 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage#getLogMessage <em>Log
- * Message</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AbstractChangePackage#getLogMessage
+ * <em>Log Message</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getAbstractChangePackage()
  * @model interface="true" abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java
index f377578..28c5b75 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/AncestorVersionSpec.java
@@ -22,13 +22,13 @@
  *
  *          <p>
  *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getTarget <em>
- *          Target</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getSource <em>
- *          Source</em>}</li>
- *          </ul>
  *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getTarget
+ *          <em>Target</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.AncestorVersionSpec#getSource
+ *          <em>Source</em>}</li>
+ *          </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getAncestorVersionSpec()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java
index caa88ea..00c53e3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/BranchInfo.java
@@ -22,13 +22,13 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo#getName <em>Name</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo#getHead <em>Head</em>}</li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.BranchInfo#getSource <em>Source</em>}
  *          </li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getBranchInfo()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java
index a7329d8..0e837ec 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackage.java
@@ -29,15 +29,15 @@
  *
  *          <p>
  *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getOperations <em>
- *          Operations</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getEvents <em>Events
- *          </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getVersionProperties <em>
- *          Version Properties</em>}</li>
- *          </ul>
  *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getOperations
+ *          <em>Operations</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getEvents <em>Events</em>
+ *          }</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackage#getVersionProperties
+ *          <em>Version Properties</em>}</li>
+ *          </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getChangePackage()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java
index edee50f..df5a100 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/ChangePackageProxy.java
@@ -18,10 +18,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageProxy#getId <em>Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getChangePackageProxy()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java
index a154797..8c9c1f3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/FileBasedChangePackage.java
@@ -25,14 +25,14 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.FileBasedChangePackage#getFilePath <em>
- *          File Path</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.FileBasedChangePackage#getFilePath
+ *          <em>File Path</em>}</li>
  *          <li>
  *          {@link org.eclipse.emf.emfstore.internal.server.model.versioning.FileBasedChangePackage#getOperationProxies
  *          <em>Operation Proxies</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getFileBasedChangePackage()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java
index 760e923..3515f47 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/HistoryInfo.java
@@ -23,27 +23,27 @@
  *
  *          <p>
  *          The following features are supported:
- *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec <em>Primary
- *          Spec</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getNextSpec <em>Next Spec
- *          </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPreviousSpec <em>
- *          Previous Spec</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedFrom <em>Merged
- *          From</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedTo <em>Merged To
- *          </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage <em>Log
- *          Message</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getTagSpecs <em>Tag Specs
- *          </em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getVersionProperties <em>
- *          Version Properties</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getChangePackage <em>Change
- *          Package</em>}</li>
- *          </ul>
  *          </p>
+ *          <ul>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec
+ *          <em>Primary Spec</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getNextSpec
+ *          <em>Next Spec</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPreviousSpec
+ *          <em>Previous Spec</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedFrom
+ *          <em>Merged From</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getMergedTo
+ *          <em>Merged To</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage
+ *          <em>Log Message</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getTagSpecs
+ *          <em>Tag Specs</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getVersionProperties
+ *          <em>Version Properties</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getChangePackage
+ *          <em>Change Package</em>}</li>
+ *          </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getHistoryInfo()
  * @model
@@ -69,8 +69,8 @@
 
 	/**
 	 * Sets the value of the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec
-	 * <em>Primary Spec</em>}' containment reference.
+	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getPrimarySpec <em>Primary Spec</em>
+	 * }' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -182,9 +182,8 @@
 	LogMessage getLogMessage();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage <em>Log Message</em>}'
-	 * containment reference.
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.internal.server.model.versioning.HistoryInfo#getLogMessage
+	 * <em>Log Message</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java
index 1915ad5..ef94565 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/LogMessage.java
@@ -24,16 +24,16 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getAuthor <em>Author</em>}
  *          </li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getMessage <em>Message</em>}
  *          </li>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getDate <em>Date</em>}</li>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getClientDate <em>Client
- *          Date</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.LogMessage#getClientDate
+ *          <em>Client Date</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getLogMessage()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java
index fbd5b62..80a85d4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/OperationProxy.java
@@ -20,10 +20,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.OperationProxy#getProxies <em>Proxies</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getOperationProxy()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java
index bd2342f..605ba80 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PagedUpdateVersionSpec.java
@@ -22,6 +22,7 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
  *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.PagedUpdateVersionSpec#getMaxChanges
  *          <em>Max Changes</em>}</li>
@@ -29,7 +30,6 @@
  *          {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PagedUpdateVersionSpec#getBaseVersionSpec
  *          <em>Base Version Spec</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getPagedUpdateVersionSpec()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java
index 22754ba..41266cf 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/PrimaryVersionSpec.java
@@ -22,14 +22,14 @@
  *
  *          <p>
  *          The following features are supported:
+ *          </p>
  *          <ul>
- *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec#getIdentifier <em>
- *          Identifier</em>}</li>
+ *          <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec#getIdentifier
+ *          <em>Identifier</em>}</li>
  *          <li>
  *          {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec#getProjectStateChecksum
  *          <em>Project State Checksum</em>}</li>
  *          </ul>
- *          </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getPrimaryVersionSpec()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java
index 8bf1baf..bfdd960 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/Version.java
@@ -20,25 +20,25 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getPrimarySpec <em>Primary Spec</em>}
  * </li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getTagSpecs <em>Tag Specs</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getNextVersion <em>Next Version</em>}
  * </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getPreviousVersion <em>Previous Version
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getPreviousVersion
+ * <em>Previous Version</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getLogMessage <em>Log Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getAncestorVersion <em>Ancestor Version
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getBranchedVersions <em>Branched
- * Versions</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedToVersion <em>Merged To Version
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedFromVersion <em>Merged From
- * Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getAncestorVersion
+ * <em>Ancestor Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getBranchedVersions
+ * <em>Branched Versions</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedToVersion
+ * <em>Merged To Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.Version#getMergedFromVersion
+ * <em>Merged From Version</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getVersion()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java
index 22fa0a4..a0fdf5f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/VersionSpec.java
@@ -19,10 +19,10 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.VersionSpec#getBranch <em>Branch</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.VersioningPackage#getVersionSpec()
  * @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java
index 9a0fef0..efeffab 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/Event.java
@@ -19,11 +19,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.Event#getTimestamp <em>Timestamp</em>}
  * </li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.events.EventsPackage#getEvent()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java
index cc282a2..c7f07e5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventImpl.java
@@ -23,11 +23,11 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Event</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.impl.EventImpl#getTimestamp <em>Timestamp
- * </em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.impl.EventImpl#getTimestamp
+ * <em>Timestamp</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java
index 5931a06..79444f0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/impl/EventsPackageImpl.java
@@ -77,8 +77,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link EventsPackage#eINSTANCE} when that field is accessed. Clients should not
-	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+	 * This method is used to initialize {@link EventsPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java
index 4846642..88e847d 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ProjectUpdatedEvent.java
@@ -18,11 +18,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ProjectUpdatedEvent#getNewVersion
  * <em>New Version</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ServerPackage#getProjectUpdatedEvent()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java
index 7e049ee..7a83ab7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/ServerProjectEvent.java
@@ -17,11 +17,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ServerProjectEvent#getProjectId
  * <em>Project Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.ServerPackage#getServerProjectEvent()
  * @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java
index d82ec6c..ae7f1ff 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ProjectUpdatedEventImpl.java
@@ -24,12 +24,12 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.impl.ProjectUpdatedEventImpl#getNewVersion
  * <em>New Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java
index 95cf8a6..3ce02fd 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerEventImpl.java
@@ -17,8 +17,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Event</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java
index 69bfa84..07bc423 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerPackageImpl.java
@@ -93,8 +93,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link ServerPackage#eINSTANCE} when that field is accessed. Clients should not
-	 * invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc -->
+	 * This method is used to initialize {@link ServerPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java
index d610d36..966011f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/events/server/impl/ServerProjectEventImpl.java
@@ -23,12 +23,12 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Project Event</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.events.server.impl.ServerProjectEventImpl#getProjectId
  * <em>Project Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java
index 629fdbc..6890aa5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/AncestorVersionSpecImpl.java
@@ -25,13 +25,13 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getTarget <em>
- * Target</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getSource <em>
- * Source</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getTarget
+ * <em>Target</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.AncestorVersionSpecImpl#getSource
+ * <em>Source</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java
index 1b1f670..cd07882 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchInfoImpl.java
@@ -25,13 +25,13 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Branch Info</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.BranchInfoImpl#getName <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.BranchInfoImpl#getHead <em>Head</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.BranchInfoImpl#getSource <em>Source</em>}
  * </li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java
index c7ddfcc..99e84d5 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/BranchVersionSpecImpl.java
@@ -18,8 +18,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Branch Version Spec</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java
index b8c38bc..e5c6353 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ChangePackageProxyImpl.java
@@ -37,13 +37,13 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.ChangePackageProxyImpl#getLogMessage <em>
- * Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.ChangePackageProxyImpl#getLogMessage
+ * <em>Log Message</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.ChangePackageProxyImpl#getId <em>Id</em>}
  * </li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java
index 021ab64..7da125a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/FileBasedChangePackageImpl.java
@@ -70,16 +70,16 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getLogMessage
  * <em>Log Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getFilePath <em>
- * File Path</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getFilePath
+ * <em>File Path</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.FileBasedChangePackageImpl#getOperationProxies
  * <em>Operation Proxies</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java
index a44e809..c1ac114 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/HistoryInfoImpl.java
@@ -34,27 +34,27 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>History Info</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPrimarySpec <em>Primary
- * Spec</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getNextSpec <em>Next Spec
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPreviousSpec <em>
- * Previous Spec</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedFrom <em>Merged
- * From</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedTo <em>Merged To
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getLogMessage <em>Log
- * Message</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getTagSpecs <em>Tag Specs
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getVersionProperties <em>
- * Version Properties</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getChangePackage <em>Change
- * Package</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPrimarySpec
+ * <em>Primary Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getNextSpec
+ * <em>Next Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getPreviousSpec
+ * <em>Previous Spec</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedFrom
+ * <em>Merged From</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getMergedTo
+ * <em>Merged To</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getLogMessage
+ * <em>Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getTagSpecs
+ * <em>Tag Specs</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getVersionProperties
+ * <em>Version Properties</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.HistoryInfoImpl#getChangePackage
+ * <em>Change Package</em>}</li>
+ * </ul>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java
index 727498c..da86faf 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/LogMessageImpl.java
@@ -25,16 +25,16 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Log Message</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getAuthor <em>Author</em>}
  * </li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getMessage <em>Message</em>}
  * </li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getDate <em>Date</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getClientDate <em>Client
- * Date</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.LogMessageImpl#getClientDate
+ * <em>Client Date</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java
index e410446..4e5c0dc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/ModelElementQueryImpl.java
@@ -37,7 +37,7 @@
  *
  * @generated NOT
  */
-public class ModelElementQueryImpl extends RangeQueryImpl<ESModelElementQuery>implements ModelElementQuery {
+public class ModelElementQueryImpl extends RangeQueryImpl<ESModelElementQuery> implements ModelElementQuery {
 
 	/**
 	 * The cached value of the '{@link #getModelElements() <em>Model Elements</em>}' containment reference list.
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java
index d3ef1ba..2477845 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/OperationProxyImpl.java
@@ -30,11 +30,11 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.OperationProxyImpl#getProxies <em>Proxies
- * </em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.OperationProxyImpl#getProxies
+ * <em>Proxies</em>}</li>
+ * </ul>
  *
  * @generated
  */
@@ -180,7 +180,7 @@
 	/**
 	 *
 	 * {@inheritDoc}
-	 * 
+	 *
 	 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.OperationProxy#setImage(org.eclipse.emf.emfstore.internal.server.model.versioning.ImageProxy)
 	 */
 	public void setImage(ImageProxy imageProxy) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java
index 71676ae..6c4565f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PagedUpdateVersionSpecImpl.java
@@ -26,6 +26,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PagedUpdateVersionSpecImpl#getMaxChanges
  * <em>Max Changes</em>}</li>
@@ -33,7 +34,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PagedUpdateVersionSpecImpl#getBaseVersionSpec
  * <em>Base Version Spec</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java
index b6f51b0..10207fa 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PathQueryImpl.java
@@ -34,7 +34,7 @@
  *
  * @generated NOT
  */
-public class PathQueryImpl extends HistoryQueryImpl<ESPathQuery>implements PathQuery {
+public class PathQueryImpl extends HistoryQueryImpl<ESPathQuery> implements PathQuery {
 
 	/**
 	 * @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java
index 9a97bb2..2c21288 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/PrimaryVersionSpecImpl.java
@@ -22,14 +22,14 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PrimaryVersionSpecImpl#getIdentifier <em>
- * Identifier</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PrimaryVersionSpecImpl#getIdentifier
+ * <em>Identifier</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.PrimaryVersionSpecImpl#getProjectStateChecksum
  * <em>Project State Checksum</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java
index 6f1aa4b..f4681fe 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/RangeQueryImpl.java
@@ -38,7 +38,7 @@
  *
  * @param <T> a API range query subtype
  */
-public class RangeQueryImpl<T extends ESRangeQuery<?>> extends HistoryQueryImpl<T>implements RangeQuery<T> {
+public class RangeQueryImpl<T extends ESRangeQuery<?>> extends HistoryQueryImpl<T> implements RangeQuery<T> {
 
 	/**
 	 * @generated NOT
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java
index 13b26a6..cbe9e7f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionImpl.java
@@ -53,27 +53,27 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Version</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPrimarySpec <em>Primary Spec
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPrimarySpec
+ * <em>Primary Spec</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getTagSpecs <em>Tag Specs</em>}
  * </li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getNextVersion <em>Next Version
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPreviousVersion <em>Previous
- * Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getLogMessage <em>Log Message
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getAncestorVersion <em>Ancestor
- * Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getBranchedVersions <em>
- * Branched Versions</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedToVersion <em>Merged
- * To Version</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedFromVersion <em>Merged
- * From Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getNextVersion
+ * <em>Next Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getPreviousVersion
+ * <em>Previous Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getLogMessage
+ * <em>Log Message</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getAncestorVersion
+ * <em>Ancestor Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getBranchedVersions
+ * <em>Branched Versions</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedToVersion
+ * <em>Merged To Version</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionImpl#getMergedFromVersion
+ * <em>Merged From Version</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java
index 6f01098..aabbbc0 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersionSpecImpl.java
@@ -21,11 +21,11 @@
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Version Spec</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.impl.VersionSpecImpl#getBranch <em>Branch</em>}
  * </li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java
index ca3110a..f3e203b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/VersioningPackageImpl.java
@@ -1307,8 +1307,8 @@
 		initEReference(getChangePackage_Events(), theEventsPackage.getEvent(), null, "events", null, 0, -1, //$NON-NLS-1$
 			ChangePackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChangePackage_VersionProperties(), getVersionProperty(), null, "versionProperties", null, 0, //$NON-NLS-1$
-			-1, ChangePackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+		initEReference(getChangePackage_VersionProperties(), getVersionProperty(), null, "versionProperties", null, //$NON-NLS-1$
+			0, -1, ChangePackage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(historyInfoEClass, HistoryInfo.class, "HistoryInfo", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
@@ -1328,18 +1328,18 @@
 		initEReference(getHistoryInfo_MergedTo(), getPrimaryVersionSpec(), null, "mergedTo", null, 1, -1, //$NON-NLS-1$
 			HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHistoryInfo_LogMessage(), getLogMessage(), null, "logMessage", null, 1, 1, HistoryInfo.class, //$NON-NLS-1$
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-			!IS_DERIVED, IS_ORDERED);
-		initEReference(getHistoryInfo_TagSpecs(), getTagVersionSpec(), null, "tagSpecs", null, 0, -1, HistoryInfo.class, //$NON-NLS-1$
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-			!IS_DERIVED, IS_ORDERED);
-		initEReference(getHistoryInfo_VersionProperties(), getVersionProperty(), null, "versionProperties", null, 0, -1, //$NON-NLS-1$
+		initEReference(getHistoryInfo_LogMessage(), getLogMessage(), null, "logMessage", null, 1, 1, //$NON-NLS-1$
 			HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getHistoryInfo_ChangePackage(), getAbstractChangePackage(), null, "changePackage", null, 0, 1, //$NON-NLS-1$
+		initEReference(getHistoryInfo_TagSpecs(), getTagVersionSpec(), null, "tagSpecs", null, 0, -1, //$NON-NLS-1$
 			HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHistoryInfo_VersionProperties(), getVersionProperty(), null, "versionProperties", null, //$NON-NLS-1$
+			0, -1, HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getHistoryInfo_ChangePackage(), getAbstractChangePackage(), null, "changePackage", null, 0, //$NON-NLS-1$
+			1, HistoryInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(historyQueryEClass, HistoryQuery.class, "HistoryQuery", IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
 			IS_GENERATED_INSTANCE_CLASS);
@@ -1385,27 +1385,27 @@
 		initEReference(getVersion_TagSpecs(), getTagVersionSpec(), null, "tagSpecs", null, 0, -1, Version.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
-		initEReference(getVersion_NextVersion(), getVersion(), getVersion_PreviousVersion(), "nextVersion", null, 0, 1, //$NON-NLS-1$
-			Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+		initEReference(getVersion_NextVersion(), getVersion(), getVersion_PreviousVersion(), "nextVersion", //$NON-NLS-1$
+			null, 0, 1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
 			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getVersion_PreviousVersion(), getVersion(), getVersion_NextVersion(), "previousVersion", null, 0, //$NON-NLS-1$
-			1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+			1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getVersion_LogMessage(), getLogMessage(), null, "logMessage", null, 0, 1, Version.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 		initEReference(getVersion_AncestorVersion(), getVersion(), getVersion_BranchedVersions(), "ancestorVersion", //$NON-NLS-1$
-			null, 0, 1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+			null, 0, 1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getVersion_BranchedVersions(), getVersion(), getVersion_AncestorVersion(), "branchedVersions", //$NON-NLS-1$
-			null, 0, -1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+			null, 0, -1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getVersion_MergedToVersion(), getVersion(), getVersion_MergedFromVersion(), "mergedToVersion", //$NON-NLS-1$
-			null, 0, -1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+			null, 0, -1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getVersion_MergedFromVersion(), getVersion(), getVersion_MergedToVersion(), "mergedFromVersion", //$NON-NLS-1$
-			null, 0, -1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+			null, 0, -1, Version.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(headVersionSpecEClass, HeadVersionSpec.class, "HeadVersionSpec", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
 			IS_GENERATED_INSTANCE_CLASS);
@@ -1428,9 +1428,9 @@
 		initEReference(getBranchInfo_Head(), getPrimaryVersionSpec(), null, "head", null, 0, 1, BranchInfo.class, //$NON-NLS-1$
 			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
-		initEReference(getBranchInfo_Source(), getPrimaryVersionSpec(), null, "source", null, 0, 1, BranchInfo.class, //$NON-NLS-1$
-			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
-			!IS_DERIVED, IS_ORDERED);
+		initEReference(getBranchInfo_Source(), getPrimaryVersionSpec(), null, "source", null, 0, 1, //$NON-NLS-1$
+			BranchInfo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(ancestorVersionSpecEClass, AncestorVersionSpec.class, "AncestorVersionSpec", !IS_ABSTRACT, //$NON-NLS-1$
 			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -1447,8 +1447,8 @@
 			PagedUpdateVersionSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 		initEReference(getPagedUpdateVersionSpec_BaseVersionSpec(), getPrimaryVersionSpec(), null, "baseVersionSpec", //$NON-NLS-1$
-			null, 0, 1, PagedUpdateVersionSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+			null, 0, 1, PagedUpdateVersionSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
+			IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
 		initEClass(abstractChangePackageEClass, AbstractChangePackage.class, "AbstractChangePackage", IS_ABSTRACT, //$NON-NLS-1$
 			IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java
index efe6736..ff66424 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/impl/persistent/Direction.java
@@ -21,7 +21,7 @@
 	/**
 	 * For iterating operations from the beginning.
 	 */
-	Forward, 
+	Forward,
 	/**
 	 * For iterating operations from the back.
 	 */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java
index 99a0eda..1acba4c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/AttributeOperation.java
@@ -16,13 +16,13 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getOldValue <em>
- * Old Value</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getNewValue <em>
- * New Value</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getOldValue
+ * <em>Old Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.AttributeOperation#getNewValue
+ * <em>New Value</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getAttributeOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java
index ee9772a..13ffe0d 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CompositeOperation.java
@@ -18,6 +18,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#getSubOperations
  * <em>Sub Operations</em>}</li>
@@ -28,10 +29,9 @@
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#getCompositeDescription
  * <em>Composite Description</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#isReversed <em>
- * Reversed</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CompositeOperation#isReversed
+ * <em>Reversed</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getCompositeOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java
index 42bf23f..5c7fc14 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ContainmentType.java
@@ -127,6 +127,8 @@
 	 * Returns the '<em><b>Containment Type</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ContainmentType get(String literal) {
@@ -143,6 +145,8 @@
 	 * Returns the '<em><b>Containment Type</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ContainmentType getByName(String name) {
@@ -159,6 +163,8 @@
 	 * Returns the '<em><b>Containment Type</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 *
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static ContainmentType get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java
index 91e9a77..b842ca9 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/CreateDeleteOperation.java
@@ -22,11 +22,11 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#isDelete <em>
- * Delete</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getModelElement
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#isDelete
+ * <em>Delete</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getModelElement
  * <em>Model Element</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getSubOperations
@@ -35,7 +35,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.CreateDeleteOperation#getEObjectToIdMap
  * <em>EObject To Id Map</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getCreateDeleteOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java
index 7b146e0..53cc691 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ModelElementGroup.java
@@ -20,13 +20,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ModelElementGroup#getName <em>Name
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ModelElementGroup#getName
+ * <em>Name</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ModelElementGroup#getModelElements
  * <em>Model Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getModelElementGroup()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java
index 225f8b5..ac71ff7 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeMoveOperation.java
@@ -16,6 +16,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeMoveOperation#getOldIndex
@@ -27,7 +28,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeMoveOperation#getReferencedValue
  * <em>Referenced Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiAttributeMoveOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java
index edc2c7f..cf20c58 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeOperation.java
@@ -18,16 +18,16 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#isAdd <em>Add
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#isAdd
+ * <em>Add</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#getIndexes
  * <em>Indexes</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeOperation#getReferencedValues
  * <em>Referenced Values</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiAttributeOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java
index c4987db..211ac3f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiAttributeSetOperation.java
@@ -16,6 +16,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeSetOperation#getIndex
  * <em>Index</em>}</li>
@@ -26,7 +27,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiAttributeSetOperation#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiAttributeSetOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java
index 9e1a855..af648b8 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceMoveOperation.java
@@ -18,6 +18,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceMoveOperation#getOldIndex
@@ -29,7 +30,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceMoveOperation#getReferencedModelElementId
  * <em>Referenced Model Element Id</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiReferenceMoveOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java
index 44bd314..b26cd9b 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceOperation.java
@@ -19,16 +19,16 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#isAdd <em>Add
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#getIndex <em>
- * Index</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#isAdd
+ * <em>Add</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#getIndex
+ * <em>Index</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceOperation#getReferencedModelElements
  * <em>Referenced Model Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiReferenceOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java
index c3859cd..10a4916 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/MultiReferenceSetOperation.java
@@ -18,6 +18,7 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceSetOperation#getIndex
  * <em>Index</em>}</li>
@@ -28,7 +29,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.MultiReferenceSetOperation#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getMultiReferenceSetOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java
index 6c34f6e..b372a96 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/OperationsPackage.java
@@ -1577,8 +1577,8 @@
 	int CONTAINMENT_TYPE = 17;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.UnsetType <em>Unset Type</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.UnsetType
+	 * <em>Unset Type</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
@@ -2715,8 +2715,7 @@
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
 		 *
-		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.
-		 *      MultiAttributeMoveOperationImpl
+		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeMoveOperationImpl
 		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.OperationsPackageImpl#getMultiAttributeMoveOperation()
 		 * @generated
 		 */
@@ -2863,8 +2862,7 @@
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
 		 *
-		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.
-		 *      MultiReferenceMoveOperationImpl
+		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceMoveOperationImpl
 		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.OperationsPackageImpl#getMultiReferenceMoveOperation()
 		 * @generated
 		 */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java
index cbe2009..f6d4e0c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/ReferenceOperation.java
@@ -16,17 +16,16 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#isBidirectional
  * <em>Bidirectional</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#getOppositeFeatureName
  * <em>Opposite Feature Name</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#getContainmentType
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.ReferenceOperation#getContainmentType
  * <em>Containment Type</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getReferenceOperation()
  * @model abstract="true"
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java
index 154e76a..77b6447 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/SingleReferenceOperation.java
@@ -18,13 +18,13 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.SingleReferenceOperation#getOldValue
  * <em>Old Value</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.SingleReferenceOperation#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.OperationsPackage#getSingleReferenceOperation()
  * @model
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java
index 58fc631..6ed8274 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/UnsetType.java
@@ -132,6 +132,8 @@
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
+	 * @param literal the literal.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static UnsetType get(String literal) {
@@ -149,6 +151,8 @@
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
+	 * @param name the name.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static UnsetType getByName(String name) {
@@ -166,6 +170,8 @@
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 *
+	 * @param value the integer value.
+	 * @return the matching enumerator or <code>null</code>.
 	 * @generated
 	 */
 	public static UnsetType get(int value) {
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java
index f19020b..c5cb1bb 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AbstractOperationImpl.java
@@ -34,18 +34,17 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#getModelElementId
  * <em>Model Element Id</em>}</li>
- * <li>
- * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#isAccepted
+ * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#isAccepted
  * <em>Accepted</em>}</li>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AbstractOperationImpl#getClientDate
  * <em>Client Date</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java
index 7838db0..52eff40 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/AttributeOperationImpl.java
@@ -28,6 +28,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AttributeOperationImpl#getOldValue
@@ -36,7 +37,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.AttributeOperationImpl#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java
index c04ac48..a056713 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CompositeOperationImpl.java
@@ -37,6 +37,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CompositeOperationImpl#getSubOperations
@@ -54,7 +55,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CompositeOperationImpl#isReversed
  * <em>Reversed</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java
index 12afec5..ae5826c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/CreateDeleteOperationImpl.java
@@ -45,6 +45,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CreateDeleteOperationImpl#isDelete
@@ -59,7 +60,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.CreateDeleteOperationImpl#getEObjectToIdMap
  * <em>EObject To Id Map</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
@@ -416,8 +416,9 @@
 		case OperationsPackage.CREATE_DELETE_OPERATION__EOBJECT_TO_ID_MAP:
 			if (coreType) {
 				return getEObjectToIdMap();
+			} else {
+				return getEObjectToIdMap().map();
 			}
-			return getEObjectToIdMap().map();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java
index cd84a33..2e41ea3 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/EObjectToModelElementIdMapImpl.java
@@ -27,6 +27,7 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.EObjectToModelElementIdMapImpl#getTypedKey
@@ -35,7 +36,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.EObjectToModelElementIdMapImpl#getTypedValue
  * <em>Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java
index 980f25f..6238622 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ModelElementGroupImpl.java
@@ -27,6 +27,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ModelElementGroupImpl#getName
  * <em>Name</em>}</li>
@@ -34,7 +35,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ModelElementGroupImpl#getModelElements
  * <em>Model Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java
index 50e2934..7c1a416 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeMoveOperationImpl.java
@@ -28,6 +28,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeMoveOperationImpl#getOldIndex
@@ -39,7 +40,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeMoveOperationImpl#getReferencedValue
  * <em>Referenced Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java
index 00e31da..75f108a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeOperationImpl.java
@@ -33,6 +33,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeOperationImpl#isAdd
@@ -44,7 +45,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeOperationImpl#getReferencedValues
  * <em>Referenced Values</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java
index a081525..878a869 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiAttributeSetOperationImpl.java
@@ -29,6 +29,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeSetOperationImpl#getIndex
@@ -40,7 +41,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiAttributeSetOperationImpl#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java
index fb784d0..a23fcf4 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceMoveOperationImpl.java
@@ -35,6 +35,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceMoveOperationImpl#getOldIndex
@@ -46,7 +47,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceMoveOperationImpl#getReferencedModelElementId
  * <em>Referenced Model Element Id</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java
index 1615f59..7584dfc 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceOperationImpl.java
@@ -44,6 +44,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceOperationImpl#isAdd
@@ -55,7 +56,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceOperationImpl#getReferencedModelElements
  * <em>Referenced Model Elements</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java
index 517d87b..5850d53 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/MultiReferenceSetOperationImpl.java
@@ -35,6 +35,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceSetOperationImpl#getIndex
@@ -46,7 +47,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.MultiReferenceSetOperationImpl#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java
index 6daa77b..ca2e23a 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationIdImpl.java
@@ -17,8 +17,6 @@
 
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Operation Id</b></em>'. <!-- end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java
index e3ddd6c..0a5a46f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/OperationsPackageImpl.java
@@ -225,8 +225,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link OperationsPackage#eINSTANCE} when that field is accessed. Clients should
-	 * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+	 * This method is used to initialize {@link OperationsPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
@@ -1071,12 +1072,12 @@
 
 		initEClass(compositeOperationEClass, CompositeOperation.class, "CompositeOperation", !IS_ABSTRACT, //$NON-NLS-1$
 			!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCompositeOperation_SubOperations(), getAbstractOperation(), null, "subOperations", null, 0, //$NON-NLS-1$
-			-1, CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCompositeOperation_MainOperation(), getAbstractOperation(), null, "mainOperation", null, 0, 1, //$NON-NLS-1$
-			CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCompositeOperation_SubOperations(), getAbstractOperation(), null, "subOperations", null, //$NON-NLS-1$
+			0, -1, CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getCompositeOperation_MainOperation(), getAbstractOperation(), null, "mainOperation", null, //$NON-NLS-1$
+			0, 1, CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getCompositeOperation_CompositeName(), ecorePackage.getEString(), "compositeName", null, 0, 1, //$NON-NLS-1$
 			CompositeOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
@@ -1103,8 +1104,8 @@
 		initEReference(getCreateDeleteOperation_ModelElement(), ecorePackage.getEObject(), null, "modelElement", null, //$NON-NLS-1$
 			0, 1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCreateDeleteOperation_SubOperations(), getReferenceOperation(), null, "subOperations", null, //$NON-NLS-1$
-			0, -1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
+		initEReference(getCreateDeleteOperation_SubOperations(), getReferenceOperation(), null, "subOperations", //$NON-NLS-1$
+			null, 0, -1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
 			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getCreateDeleteOperation_EObjectToIdMap(), getEObjectToModelElementIdMap(), null,
 			"eObjectToIdMap", null, 0, -1, CreateDeleteOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
@@ -1209,8 +1210,8 @@
 		initEAttribute(getReferenceOperation_OppositeFeatureName(), ecorePackage.getEString(), "oppositeFeatureName", //$NON-NLS-1$
 			null, 0, 1, ReferenceOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
 			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getReferenceOperation_ContainmentType(), getContainmentType(), "containmentType", null, 0, 1, //$NON-NLS-1$
-			ReferenceOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+		initEAttribute(getReferenceOperation_ContainmentType(), getContainmentType(), "containmentType", null, 0, //$NON-NLS-1$
+			1, ReferenceOperation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
 			!IS_DERIVED, IS_ORDERED);
 
 		initEClass(operationIdEClass, OperationId.class, "OperationId", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java
index 23ccd4b..582bcac 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/ReferenceOperationImpl.java
@@ -23,6 +23,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ReferenceOperationImpl#isBidirectional
@@ -34,7 +35,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.ReferenceOperationImpl#getContainmentType
  * <em>Containment Type</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java
index 55bd719..3334f9f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/impl/SingleReferenceOperationImpl.java
@@ -38,6 +38,7 @@
  * end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.SingleReferenceOperationImpl#getOldValue
@@ -46,7 +47,6 @@
  * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.operations.impl.SingleReferenceOperationImpl#getNewValue
  * <em>New Value</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java
index 1d729c9..b46415c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/SemanticPackage.java
@@ -71,8 +71,7 @@
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
 	 *
-	 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.
-	 *      SemanticCompositeOperationImpl
+	 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticCompositeOperationImpl
 	 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticPackageImpl#getSemanticCompositeOperation()
 	 * @generated
 	 */
@@ -210,8 +209,7 @@
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
 		 *
-		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.
-		 *      SemanticCompositeOperationImpl
+		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticCompositeOperationImpl
 		 * @see org.eclipse.emf.emfstore.internal.server.model.versioning.operations.semantic.impl.SemanticPackageImpl#getSemanticCompositeOperation()
 		 * @generated
 		 */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java
index 4a990f4..354790c 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticCompositeOperationImpl.java
@@ -18,8 +18,6 @@
 /**
  * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Composite Operation</b></em>'. <!--
  * end-user-doc -->
- * <p>
- * </p>
  *
  * @generated
  */
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java
index a6eefda..ac72577 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/semantic/impl/SemanticPackageImpl.java
@@ -76,8 +76,9 @@
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 *
 	 * <p>
-	 * This method is used to initialize {@link SemanticPackage#eINSTANCE} when that field is accessed. Clients should
-	 * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc
+	 * This method is used to initialize {@link SemanticPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
 	 *
 	 * @see #eNS_URI
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java
index 9d64a05..b5b7102 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/operations/util/OperationsAdapterFactory.java
@@ -481,8 +481,8 @@
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry
-	 * <em>EObject To Model Element Id Map</em>}'.
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>EObject To Model Element Id Map</em>
+	 * }'.
 	 * <!-- begin-user-doc --> This
 	 * default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases
diff --git a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java
index 0f732d3..38b3c9f 100644
--- a/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java
+++ b/bundles/org.eclipse.emf.emfstore.server.model/src/org/eclipse/emf/emfstore/internal/server/model/versioning/util/VersioningAdapterFactory.java
@@ -265,8 +265,8 @@
 
 	/**
 	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec
-	 * <em>Primary Version Spec</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.PrimaryVersionSpec <em>Primary Version Spec</em>
+	 * }'.
 	 * <!-- begin-user-doc --> This default
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
@@ -593,8 +593,8 @@
 
 	/**
 	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageProxy
-	 * <em>Change Package Proxy</em>}'.
+	 * {@link org.eclipse.emf.emfstore.internal.server.model.versioning.ChangePackageProxy <em>Change Package Proxy</em>
+	 * }'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java
index 04f79fb..889ba1e 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/EMFStore.java
@@ -421,7 +421,7 @@
 	 *         there were more recent versions of these properties on the server
 	 * @throws ESException
 	 *             if any error occurs in the EmfStore
-	 * */
+	 */
 	List<EMFStoreProperty> setEMFProperties(SessionId sessionId, List<EMFStoreProperty> property, ProjectId projectId)
 		throws ESException;
 
@@ -438,7 +438,7 @@
 	 * @throws ESException
 	 *             if any error occurs in the EmfStore
 	 *
-	 * **/
+	 **/
 	List<EMFStoreProperty> getEMFProperties(SessionId sessionId, ProjectId projectId) throws ESException;
 
 	/**
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java
index 9c164ca..f5e6f58 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/AccessControl.java
@@ -158,7 +158,7 @@
 					MessageFormat.format(
 						Messages.AccessControl_MultipleExtensionsDiscovered,
 						ACCESSCONTROL_EXTENSION_ID + "." + ORG_UNIT_RESOLVER_SERVICE_CLASS //$NON-NLS-1$
-				));
+					));
 			}
 		} catch (final ESExtensionPointException e) {
 			final String message = "Custom org unit resolver class not be initialized"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java
index dd122df..0169791 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/DefaultESAuthorizationService.java
@@ -235,7 +235,7 @@
 	 */
 	public boolean checkProjectAdminAccessForOrgUnit(ESSessionId sessionId, ESOrgUnitId orgUnitId,
 		Set<ESGlobalProjectId> projectIds)
-			throws AccessControlException {
+		throws AccessControlException {
 
 		checkSession(sessionId);
 		cleanupPARole(orgUnitId);
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java
index 4e1f30f..bafbd73 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/accesscontrol/LoginService.java
@@ -118,7 +118,7 @@
 	 */
 	public ESAuthenticationInformation logIn(String username, String password,
 		ESClientVersionInfo clientVersionInfo)
-			throws AccessControlException {
+		throws AccessControlException {
 
 		synchronized (MonitorProvider.getInstance().getMonitor(MONITOR_NAME)) {
 			final ESAuthenticationInformation authInfo = getUserVerifierService().verifyUser(
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java
index 5b13e26..3cfd409 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/conflictDetection/ReservationToConflictBucketCandidateMap.java
@@ -87,7 +87,7 @@
 				|| reservationToConflictMap.hasFullReservation(modelElement)) {
 				final ConflictBucketCandidate mergedConflictBucketCandidates = mergeConflictBucketCandidates(
 					reservationToConflictMap
-					.getConflictBucketCandidates(modelElement),
+						.getConflictBucketCandidates(modelElement),
 					currentConflictBucketCandidate);
 				reservationToConflictMap.addFullReservation(modelElement, mergedConflictBucketCandidates);
 				continue;
@@ -153,11 +153,11 @@
 
 					final ConflictBucketCandidate mergedConflictBucketCandidates = mergeConflictBucketCandidates(
 						reservationToConflictMap
-						.getConflictBucketCandidates(
-							modelElement,
-							featureName,
-							oppositeModelElement),
-							currentConflictBucketCandidate);
+							.getConflictBucketCandidates(
+								modelElement,
+								featureName,
+								oppositeModelElement),
+						currentConflictBucketCandidate);
 
 					reservationToConflictMap.addMultiReferenceWithOppositeReservation(
 						modelElement,
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
index 048b7f7..aafa8b4 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/XmlRpcEmfStoreImpl.java
@@ -152,7 +152,7 @@
 	 */
 	public FileChunk downloadFileChunk(SessionId sessionId, ProjectId projectId,
 		FileTransferInformation fileInformation)
-			throws ESException {
+		throws ESException {
 		return getEmfStore().downloadFileChunk(sessionId, projectId, fileInformation);
 	}
 
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java
index fba7827..803cffa 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/connection/xmlrpc/util/EObjectSerializer.java
@@ -205,4 +205,3 @@
 		serializationOptionsInitialized = true;
 	}
 }
-
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java
index 17b356a..a0b9067 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AbstractEmfstoreInterface.java
@@ -216,7 +216,7 @@
 	 */
 	protected synchronized void checkProjectAdminAccess(SessionId sessionId, ProjectId projectId,
 		ESProjectAdminPrivileges privilege)
-			throws AccessControlException {
+		throws AccessControlException {
 		if (accessControlDisabled) {
 			return;
 		}
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java
index 12863ea..755e4f8 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/core/AdminEmfStoreImpl.java
@@ -74,7 +74,7 @@
 	 */
 	public AdminEmfStoreImpl(ServerSpace serverSpace,
 		AccessControl accessControl)
-			throws FatalESException {
+		throws FatalESException {
 		super(serverSpace, accessControl);
 	}
 
@@ -541,7 +541,7 @@
 			if (!isServerAdmin && role.canAdministrate(resolvedProjectId)) {
 				throw new AccessControlException(
 					Messages.AdminEmfStoreImpl_RemovePA_Violation_1
-					+ Messages.AdminEmfStoreImpl_RemovePA_Violation_2);
+						+ Messages.AdminEmfStoreImpl_RemovePA_Violation_2);
 			}
 
 			role.getProjects().remove(resolvedProjectId);
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java
index 5f1ab6c..06bbb16 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/EmfStoreValidator.java
@@ -175,7 +175,7 @@
 						for (final AbstractOperation abstractOperation : operations.iterable()) {
 							if (!(abstractOperation instanceof CompositeOperation)
 								&& (abstractOperation.getModelElementId() == null
-								|| abstractOperation.getModelElementId().getId() == null)) {
+									|| abstractOperation.getModelElementId().getId() == null)) {
 								errors.add(
 									MessageFormat.format(
 										Messages.EmfStoreValidator_ChangeOperation_Has_No_ModelElementId,
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java
index 986064c..1c651fb 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/startup/ServerHrefMigrator.java
@@ -198,7 +198,7 @@
 	}
 
 	private String getProjectAttribute(String pathToFile) throws ParserConfigurationException, SAXException,
-	IOException {
+		IOException {
 		final DocumentBuilderFactory docFactory = DocumentBuilderFactory
 			.newInstance();
 		final DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
@@ -269,7 +269,8 @@
 		}
 	}
 
-	private void removeReferencesToCorruptProject(String serverHome, String projectId) throws InvocationTargetException {
+	private void removeReferencesToCorruptProject(String serverHome, String projectId)
+		throws InvocationTargetException {
 		try {
 			final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
 			final DocumentBuilder builder = factory.newDocumentBuilder();
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java
index 6c4bd12..0c45811 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/FileDynamicModelProvider.java
@@ -56,7 +56,7 @@
 			for (final File file : files) {
 				final ResourceSet resourceSet = new ResourceSetImpl();
 				resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap()
-				.put("ecore", new EcoreResourceFactoryImpl());
+					.put("ecore", new EcoreResourceFactoryImpl());
 				final Resource resource = resourceSet.getResource(URI.createFileURI(file.getAbsolutePath()), true);
 				final EPackage model = (EPackage) resource.getContents().get(0);
 				result.add(model);
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java
index 607777c..0d82f1f 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/internal/server/storage/ServerSpaceFileURIHandler.java
@@ -46,8 +46,7 @@
 	}
 
 	@Override
-	public void delete(URI uri, Map<?, ?> options) throws IOException
-	{
+	public void delete(URI uri, Map<?, ?> options) throws IOException {
 		// TODO options?
 		final File file = new File(uri.toFileString());
 		final File parent = file.getParentFile();
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java
index 11528c8..73a61a5 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESAuthorizationService.java
@@ -43,7 +43,7 @@
 	 */
 	boolean checkProjectAdminAccess(ESSessionId sessionId, ESGlobalProjectId projectId,
 		ESProjectAdminPrivileges privileg)
-			throws AccessControlException;
+		throws AccessControlException;
 
 	/**
 	 * Check if the session is valid for admin access to the given organizational unit.
@@ -76,7 +76,7 @@
 	 */
 	boolean checkProjectAdminAccessForOrgUnit(ESSessionId sessionId, ESOrgUnitId orgUnitId,
 		Set<ESGlobalProjectId> projectIds)
-			throws AccessControlException;
+		throws AccessControlException;
 
 	/**
 	 * Check if the session is valid for admin access to the given project.
diff --git a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
index 539611c..84c178e 100644
--- a/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
+++ b/bundles/org.eclipse.emf.emfstore.server/src/org/eclipse/emf/emfstore/server/auth/ESUserVerifier.java
@@ -41,7 +41,7 @@
 	 */
 	ESAuthenticationInformation verifyUser(String username, String password,
 		ESClientVersionInfo clientVersionInfo)
-			throws AccessControlException;
+		throws AccessControlException;
 
 	/**
 	 * Initializes this verifier.
diff --git a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java
index 84345c7..5a719bd 100644
--- a/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.api.test/src/org/eclipse/emf/emfstore/client/api/test/RemoteProjectTest.java
@@ -169,7 +169,8 @@
 			getUsersession(),
 			ESHistoryQuery.FACTORY
 				.pathQuery(getRemoteProject().getHeadVersion(monitor),
-					getRemoteProject().getHeadVersion(monitor), true, true), monitor);
+					getRemoteProject().getHeadVersion(monitor), true, true),
+			monitor);
 		assertEquals(1, historyInfos.size());
 	}
 
@@ -179,7 +180,8 @@
 		final List<? extends ESHistoryInfo> historyInfos = getRemoteProject().getHistoryInfos(
 			ESHistoryQuery.FACTORY.pathQuery(
 				getRemoteProject().getHeadVersion(monitor),
-				getRemoteProject().getHeadVersion(monitor), true, true), monitor);
+				getRemoteProject().getHeadVersion(monitor), true, true),
+			monitor);
 		assertEquals(1, historyInfos.size());
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java
index 8a93fe3..c62279a 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/command/CommandTest.java
@@ -632,8 +632,7 @@
 
 		// cut to clipboard
 		final Command cutCommand = CutToClipboardCommand.create(editingDomain, leafSection,
-			TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS
-			, actor);
+			TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS, actor);
 
 		if (cutCommand.canExecute()) {
 			editingDomain.getCommandStack().execute(cutCommand);
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java
index 837b975..63c019f 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1to1Test.java
@@ -56,7 +56,7 @@
 	 */
 	@Test
 	public void containmentNullToValueNotContainedAlreadyOperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement solution = Create.testElement();
@@ -109,7 +109,7 @@
 	 */
 	@Test
 	public void containmentNullToValueNotContainedAlreadyOperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement solution = Create.testElement();
@@ -163,7 +163,7 @@
 	 */
 	@Test
 	public void containmentValueToOtherValueNotContainedAlreadyOperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement solutionOld = Create.testElement();
@@ -232,7 +232,7 @@
 	 */
 	@Test
 	public void containmentValueToOtherValueNotContainedAlreadyOperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement solutionOld = Create.testElement();
@@ -308,7 +308,7 @@
 	 */
 	@Test
 	public void containmentValueToOtherValueContainedAlready1OperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue1 = Create.testElement();
 		final TestElement issue2 = Create.testElement();
@@ -384,7 +384,7 @@
 	 */
 	@Test
 	public void containmentValueToOtherValueContainedAlready1OperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue1 = Create.testElement();
 		final TestElement issue2 = Create.testElement();
@@ -460,7 +460,7 @@
 	 */
 	@Test
 	public void containmentNullToOtherValueContainedAlready1OperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue1 = Create.testElement();
 		final TestElement issue2 = Create.testElement();
@@ -525,7 +525,7 @@
 	 */
 	@Test
 	public void containmentNullToOtherValueContainedAlready1OperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue1 = Create.testElement();
 		final TestElement issue2 = Create.testElement();
@@ -596,7 +596,7 @@
 	// BEGIN COMPLEX CODE
 	@Test
 	public void containmentValueToOtherValueContainedAlreadyNOperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement leafSection = Create.testElement();
@@ -692,7 +692,7 @@
 	// BEGIN COMPLEX CODE
 	@Test
 	public void containmentValueToOtherValueContainedAlreadyNOperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement leafSection = Create.testElement();
@@ -784,7 +784,7 @@
 	 */
 	@Test
 	public void containmentNullToValueContainedAlreadyNOperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement leafSection = Create.testElement();
@@ -863,7 +863,7 @@
 	 */
 	@Test
 	public void containmentNullToValueContainedAlreadyNOperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement leafSection = Create.testElement();
@@ -946,7 +946,7 @@
 	 */
 	@Test
 	public void containmentValueToNullOperateOnParent() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement solution = Create.testElement();
@@ -994,7 +994,7 @@
 	 */
 	@Test
 	public void containmentValueToNullOperateOnChild() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement solution = Create.testElement();
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java
index ea8f272..6d77767 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/Topology1toNTest.java
@@ -413,7 +413,7 @@
 	 */
 	@Test
 	public void containmentAddUncontainedChildrenFakeManyToNonEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement section = Create.testElement();
 		final TestElement actor1 = Create.testElement();
@@ -1251,7 +1251,7 @@
 	// BEGIN COMPLEX CODE
 	@Test
 	public void containmentAddDifferentFeatureContained1ChildrenToNonEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement section = Create.testElement();
 		final TestElement issue1 = Create.testElement();
@@ -1728,7 +1728,8 @@
 	 * @throws UnsupportedNotificationException on test fail
 	 */
 	@Test
-	public void containmentRemoveChildAndEmpty() throws UnsupportedOperationException, UnsupportedNotificationException {
+	public void containmentRemoveChildAndEmpty()
+		throws UnsupportedOperationException, UnsupportedNotificationException {
 
 		final TestElement section = Create.testElement();
 		final TestElement actor = Create.testElement();
@@ -1776,7 +1777,7 @@
 	 */
 	@Test
 	public void containmentRemoveChildrenAndEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement section = Create.testElement();
 		final TestElement actor1 = Create.testElement();
@@ -1939,7 +1940,7 @@
 	 */
 	@Test
 	public void nonContainmentAddChildrenToEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement useCase = Create.testElement();
 		final TestElement actor1 = Create.testElement();
@@ -2004,7 +2005,7 @@
 	 */
 	@Test
 	public void nonContainmentAddChildToNonEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement useCase = Create.testElement();
 		final TestElement oldTestElement = Create.testElement();
@@ -2060,7 +2061,7 @@
 	 */
 	@Test
 	public void nonContainmentAddChildrenToNonEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement useCase = Create.testElement();
 		final TestElement oldTestElement = Create.testElement();
@@ -2127,7 +2128,7 @@
 	 */
 	@Test
 	public void nonContainmentRemoveChildAndEmpty() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement useCase = Create.testElement();
 		final TestElement actor = Create.testElement();
diff --git a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java
index 74dd4cb..a8df1ff 100644
--- a/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java
+++ b/tests/org.eclipse.emf.emfstore.client.changetracking.test/src/org/eclipse/emf/emfstore/client/changetracking/test/toplogy/TopologyNto1Test.java
@@ -151,7 +151,7 @@
 	 */
 	@Test
 	public void setNoncontainingParentFromNullToValue() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement actor = Create.testElement();
 		final TestElement useCase = Create.testElement();
@@ -206,7 +206,7 @@
 	 */
 	@Test
 	public void setNoncontainingParentFromValueToNull() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement actor = Create.testElement();
 		final TestElement useCase = Create.testElement();
@@ -262,7 +262,7 @@
 	 */
 	@Test
 	public void setNoncontainingParentFromValueToOtherValue() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement actor = Create.testElement();
 		final TestElement otherTestElement = Create.testElement();
@@ -331,7 +331,7 @@
 
 	@Test
 	public void setContainerFromValueToOtherValueSameFeature() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement section1 = Create.testElement();
 		final TestElement section2 = Create.testElement();
@@ -398,7 +398,7 @@
 
 	@Test
 	public void setContainerFromValueToOtherValueDifferentFeatureN() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement section = Create.testElement();
 		final TestElement pack = Create.testElement();
@@ -471,7 +471,7 @@
 
 	@Test
 	public void setContainerFromValueToOtherValueDifferentFeature1() throws UnsupportedOperationException,
-	UnsupportedNotificationException {
+		UnsupportedNotificationException {
 
 		final TestElement issue = Create.testElement();
 		final TestElement section = Create.testElement();
diff --git a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java
index 5673bcd..c1d531d 100644
--- a/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.conflictdetection.test/src/org/eclipse/emf/emfstore/client/conflictdetection/test/ConflictDetectionMapTest.java
@@ -525,7 +525,8 @@
 
 		final List<AbstractOperation> operations = forceGetOperations();
 		assertEquals(2, operations.size());
-		final CreateDeleteOperation createDeleteOperation = checkAndCast(operations.get(0), CreateDeleteOperation.class);
+		final CreateDeleteOperation createDeleteOperation = checkAndCast(operations.get(0),
+			CreateDeleteOperation.class);
 
 		final MultiReferenceOperation multiRefOp = checkAndCast(
 			createDeleteOperation.getSubOperations().get(0),
@@ -565,10 +566,8 @@
 	private void addObserverTo(ESLocalProject localProject,
 		IdEObjectCollectionChangeObserver idEObjectCollectionChangeObserver) {
 		ESLocalProjectImpl.class.cast(
-			localProject
-			).toInternalAPI().getProject().addIdEObjectCollectionChangeObserver(
-				idEObjectCollectionChangeObserver
-			);
+			localProject).toInternalAPI().getProject().addIdEObjectCollectionChangeObserver(
+				idEObjectCollectionChangeObserver);
 	}
 
 	@Test
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java
index e693a8f..ca868e8 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/AllocateIdsPolicyTest.java
@@ -105,7 +105,8 @@
 	public void commandIdAllocation() {
 		removeAddWithCommand(new EqualComparator());
 		removeAddWithCommands(new NotEqualComparator());
-		if (ESWorkspaceProviderImpl.getInstance().getEditingDomain().getCommandStack() instanceof EMFStoreBasicCommandStack) {
+		if (ESWorkspaceProviderImpl.getInstance().getEditingDomain()
+			.getCommandStack() instanceof EMFStoreBasicCommandStack) {
 			removeAddWithoutCommand(new NotEqualComparator());
 			removeAddWithoutCommand2(new NotEqualComparator());
 		}
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java
index 2b651ec..6bc0836 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/MultiReferenceOperationTest.java
@@ -110,7 +110,8 @@
 		assertEquals(TestElementFeatures.nonContained1ToN().getName(), multiReferenceOperation.getFeatureName());
 		assertEquals(0, multiReferenceOperation.getIndex());
 		assertEquals(actorId, multiReferenceOperation.getModelElementId());
-		assertEquals(TestElementFeatures.nonContainedNTo1().getName(), multiReferenceOperation.getOppositeFeatureName());
+		assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
+			multiReferenceOperation.getOppositeFeatureName());
 		assertTrue(multiReferenceOperation.isAdd());
 		assertTrue(multiReferenceOperation.isBidirectional());
 
@@ -173,7 +174,8 @@
 		final ModelElementId useCaseId = ModelUtil.getProject(useCase).getModelElementId(useCase);
 
 		final MultiReferenceOperation reversedMultiReferenceOperation = (MultiReferenceOperation) reverse;
-		assertEquals(TestElementFeatures.nonContained1ToN().getName(), reversedMultiReferenceOperation.getFeatureName());
+		assertEquals(TestElementFeatures.nonContained1ToN().getName(),
+			reversedMultiReferenceOperation.getFeatureName());
 		assertEquals(0, reversedMultiReferenceOperation.getIndex());
 		assertEquals(actorId, reversedMultiReferenceOperation.getModelElementId());
 		assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
@@ -282,7 +284,8 @@
 		assertEquals(TestElementFeatures.nonContained1ToN().getName(), multiReferenceOperation.getFeatureName());
 		assertEquals(0, multiReferenceOperation.getIndex());
 		assertEquals(actorId, multiReferenceOperation.getModelElementId());
-		assertEquals(TestElementFeatures.nonContainedNTo1().getName(), multiReferenceOperation.getOppositeFeatureName());
+		assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
+			multiReferenceOperation.getOppositeFeatureName());
 		assertTrue(multiReferenceOperation.isAdd());
 		assertTrue(multiReferenceOperation.isBidirectional());
 
@@ -380,7 +383,8 @@
 		assertEquals(TestElementFeatures.nonContained1ToN().getName(), multiReferenceOperation.getFeatureName());
 		assertEquals(0, multiReferenceOperation.getIndex());
 		assertEquals(actorId, multiReferenceOperation.getModelElementId());
-		assertEquals(TestElementFeatures.nonContainedNTo1().getName(), multiReferenceOperation.getOppositeFeatureName());
+		assertEquals(TestElementFeatures.nonContainedNTo1().getName(),
+			multiReferenceOperation.getOppositeFeatureName());
 		assertFalse(multiReferenceOperation.isAdd());
 		assertTrue(multiReferenceOperation.isBidirectional());
 
diff --git a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
index 4888da7..08d909f 100644
--- a/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.recording.test/src/org/eclipse/emf/emfstore/client/recording/test/OperationRecorderTest.java
@@ -134,7 +134,8 @@
 	@Test
 	public void rescueElementAndDeleteIt() {
 
-		if (ESWorkspaceProviderImpl.getInstance().getEditingDomain().getCommandStack() instanceof EMFStoreBasicCommandStack) {
+		if (ESWorkspaceProviderImpl.getInstance().getEditingDomain()
+			.getCommandStack() instanceof EMFStoreBasicCommandStack) {
 
 			// ExtensionRegistry.INSTANCE.set(ESOperationModifier.ID, new AutoOperationWrapper());
 
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java
index 0b94b00..aacd491 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTest.java
@@ -121,7 +121,7 @@
 	}
 
 	protected static void deleteRemoteProjects(ESUsersession usersession) throws IOException, FatalESException,
-	ESException {
+		ESException {
 		for (final ESRemoteProject project : ESWorkspaceProvider.INSTANCE.getWorkspace().getServers().get(0)
 			.getRemoteProjects(usersession)) {
 			project.delete(usersession, new NullProgressMonitor());
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java
index bd147a0..c7c5c1e 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/AbstractUIControllerTestWithCommit.java
@@ -318,8 +318,8 @@
 		getBot().waitUntil(new DefaultCondition() {
 			// BEGIN SUPRESS CATCH EXCEPTION
 			public boolean test() throws Exception {
-				return getCopy().getBaseVersion().getIdentifier() ==
-				getLocalProject().getBaseVersion().getIdentifier() - 1;
+				return getCopy().getBaseVersion().getIdentifier() == getLocalProject().getBaseVersion().getIdentifier()
+					- 1;
 			}
 
 			// END SUPRESS CATCH EXCEPTION
@@ -337,8 +337,7 @@
 		getBot().waitUntil(new DefaultCondition() {
 			// BEGIN SUPRESS CATCH EXCEPTION
 			public boolean test() throws Exception {
-				return getCopy().getBaseVersion().getIdentifier() ==
-				getLocalProject().getBaseVersion().getIdentifier();
+				return getCopy().getBaseVersion().getIdentifier() == getLocalProject().getBaseVersion().getIdentifier();
 			}
 
 			// END SUPRESS CATCH EXCEPTION
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java
index 26e82a3..c5a29cd 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIAskForBranchCheckoutControllerTest.java
@@ -57,7 +57,8 @@
 
 			// BEGIN SUPRESS CATCH EXCEPTION
 			public boolean test() throws Exception {
-				for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace().getLocalProjects()) {
+				for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace()
+					.getLocalProjects()) {
 					if (localProject.getProjectName().equals("checkout")) {
 						return true;
 					}
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java
index 050b566..29b8e09 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIBranchControllersTest.java
@@ -82,7 +82,8 @@
 		getBot().waitUntil(new DefaultCondition() {
 			// BEGIN SUPRESS CATCH EXCEPTION
 			public boolean test() throws Exception {
-				for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace().getLocalProjects()) {
+				for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace()
+					.getLocalProjects()) {
 					if (localProject.getProjectName().equals("branch-checkout")) {
 						return true;
 					}
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java
index fbd6b96..3209f3d 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UICheckoutControllerTest.java
@@ -52,7 +52,8 @@
 
 			// BEGIN SUPRESS CATCH EXCEPTION
 			public boolean test() throws Exception {
-				for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace().getLocalProjects()) {
+				for (final ESLocalProject localProject : ESWorkspaceProvider.INSTANCE.getWorkspace()
+					.getLocalProjects()) {
 					if (localProject.getProjectName().equals("checkout")) {
 						if (localProject.getBaseVersion().getIdentifier() == 1) {
 							return true;
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java
index a05da41..39d5ac1 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UISessionControllerTest.java
@@ -60,8 +60,8 @@
 	private void logout() {
 		UIThreadRunnable.syncExec(new VoidResult() {
 			public void run() {
-				logoutSessionController =
-					new UILogoutSessionController(getBot().getDisplay().getActiveShell(), getUsersession());
+				logoutSessionController = new UILogoutSessionController(getBot().getDisplay().getActiveShell(),
+					getUsersession());
 				logoutSessionController.execute();
 			}
 		});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java
index 676b953..c18be1a 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerForElementTest.java
@@ -35,8 +35,8 @@
 
 		UIThreadRunnable.asyncExec(new VoidResult() {
 			public void run() {
-				final UIShowHistoryController showHistoryController =
-					new UIShowHistoryController(getBot().getDisplay().getActiveShell(), player);
+				final UIShowHistoryController showHistoryController = new UIShowHistoryController(
+					getBot().getDisplay().getActiveShell(), player);
 				showHistoryController.execute();
 			}
 		});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java
index c783e3e..676b402 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIShowHistoryControllerTest.java
@@ -33,8 +33,8 @@
 		createPlayerAndCommit();
 		UIThreadRunnable.asyncExec(new VoidResult() {
 			public void run() {
-				final UIShowHistoryController showHistoryController =
-					new UIShowHistoryController(getBot().getDisplay().getActiveShell(), getLocalProject());
+				final UIShowHistoryController showHistoryController = new UIShowHistoryController(
+					getBot().getDisplay().getActiveShell(), getLocalProject());
 				showHistoryController.execute();
 			}
 		});
diff --git a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java
index deb94f0..faa98c1 100644
--- a/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java
+++ b/tests/org.eclipse.emf.emfstore.client.test.ui/src/org/eclipse/emf/emfstore/client/test/ui/controllers/UIUndoLastOperationControllerTest.java
@@ -71,7 +71,8 @@
 			public void run() {
 				final UIUndoLastOperationController undoLastOperationController = new UIUndoLastOperationController(
 					getBot()
-						.getDisplay().getActiveShell(), getLocalProject());
+						.getDisplay().getActiveShell(),
+					getLocalProject());
 				undoLastOperationController.execute();
 			}
 		});
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
index cad68c1..c274a3e 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/BigMutationTest.java
@@ -43,8 +43,7 @@
 	/***/
 	@Test
 	public void createModel() {
-		final ESModelMutatorConfiguration config =
-			new ESModelMutatorConfiguration(util.getEPackages(), root, 1L);
+		final ESModelMutatorConfiguration config = new ESModelMutatorConfiguration(util.getEPackages(), root, 1L);
 		config.setMinObjectsCount(util.getMinObjectsCount());
 		ESDefaultModelMutator.changeModel(config);
 		// TODO: no assert here..
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
index 2be261b..96cdf76 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/CrossResourceReferencesMutatorTest.java
@@ -84,10 +84,10 @@
 
 		final Project clonedProject = EcoreUtil.copy(project);
 
-		final ESCrossResourceReferencesModelMutator mutator =
-			new ESCrossResourceReferencesModelMutator(getConfig(project));
-		final ESCrossResourceReferencesModelMutator secondMutator =
-			new ESCrossResourceReferencesModelMutator(getConfig(clonedProject));
+		final ESCrossResourceReferencesModelMutator mutator = new ESCrossResourceReferencesModelMutator(
+			getConfig(project));
+		final ESCrossResourceReferencesModelMutator secondMutator = new ESCrossResourceReferencesModelMutator(
+			getConfig(clonedProject));
 
 		mutator.mutateUntil(ESPredicates.hasExternalReference());
 		secondMutator.mutateUntil(ESPredicates.hasExternalReference());
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
index ebc4ef6..2a699b6 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectConfigTest.java
@@ -17,8 +17,8 @@
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
index 39219b9..a5b6f94 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/FuzzyProjectTest.java
@@ -70,7 +70,7 @@
 		{
 			put(ESEMFDataProvider.MUTATOR_EDITINGDOMAIN,
 				((ESWorkspaceProviderImpl) ESWorkspaceProvider.INSTANCE)
-				.getEditingDomain());
+					.getEditingDomain());
 		}
 	};
 
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
index 6f2e216..a13a6f1 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/MutatorTest.java
@@ -19,11 +19,11 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
 import org.eclipse.emf.emfstore.fuzzy.emf.ESMutateUtil;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESDefaultModelMutator;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Data;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Util;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESDefaultModelMutator;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.internal.common.model.ModelFactory;
 import org.eclipse.emf.emfstore.internal.common.model.ModelPackage;
 import org.eclipse.emf.emfstore.internal.common.model.Project;
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
index cac0b96..8b0c50f 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/OperationReverseTest.java
@@ -13,8 +13,8 @@
 package org.eclipse.emf.emfstore.fuzzy.emf.test;
 
 import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.internal.client.model.impl.ProjectSpaceBase;
 import org.eclipse.emf.emfstore.internal.client.model.util.EMFStoreCommand;
 import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorConfiguration;
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
index 9ee2528..aced67d 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/SerializationTest.java
@@ -16,8 +16,8 @@
 import org.eclipse.emf.emfstore.client.util.ESVoidCallable;
 import org.eclipse.emf.emfstore.client.util.RunESCommand;
 import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.internal.client.model.ESWorkspaceProviderImpl;
 import org.eclipse.emf.emfstore.internal.client.model.ProjectSpace;
 import org.eclipse.emf.emfstore.internal.client.model.impl.WorkspaceImpl;
diff --git a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
index 18c0149..3fb8fb4 100644
--- a/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
+++ b/tests/org.eclipse.emf.emfstore.fuzzy.emf.test/src/org/eclipse/emf/emfstore/fuzzy/emf/test/ServerTest.java
@@ -18,10 +18,10 @@
 import org.eclipse.emf.emfstore.client.util.RunESCommand;
 import org.eclipse.emf.emfstore.fuzzy.emf.ESEMFDataProvider;
 import org.eclipse.emf.emfstore.fuzzy.emf.ESMutateUtil;
-import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Data;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.DataProvider;
 import org.eclipse.emf.emfstore.fuzzy.emf.junit.Annotations.Util;
+import org.eclipse.emf.emfstore.fuzzy.emf.junit.ESFuzzyRunner;
 import org.eclipse.emf.emfstore.internal.client.model.impl.api.ESLocalProjectImpl;
 import org.eclipse.emf.emfstore.internal.common.model.Project;
 import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorConfiguration;
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs
index 99f26c0..f548abb 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.resources.prefs
@@ -1,2 +1,6 @@
 eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
 encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs
index af0f20f..edbd6f6 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
 eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..791508d
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,115 @@
+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
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java
index f966ed3..d6e2efa 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/internal/modelmutator/mutation/MutationTargetSelectorTest.java
@@ -12,12 +12,15 @@
 
 package org.eclipse.emf.emfstore.internal.modelmutator.mutation;
 
-import static org.junit.Assert.*;
-import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.*;
+import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.IS_CONTAINMENT_REFERENCE;
+import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.hasMaxNumberOfContainments;
+import static org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationPredicates.isListWithSpecifiedSize;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.emfstore.internal.modelmutator.mutation.MutationTargetSelector;
 import org.eclipse.emf.emfstore.modelmutator.ESMutationException;
 import org.eclipse.emf.emfstore.modelmutator.test.AbstractMutationTest;
 import org.junit.Test;
@@ -31,8 +34,7 @@
 	@Test
 	public void isSelectionValidForInvalidCombinationOfFeatureAndObject() {
 
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetFeature(E_PACKAGE.getEEnum_ELiterals());
 		selector.setTargetObject(ePackageWithTwoClasses);
 		assertFalse(selector.isValid());
@@ -40,29 +42,24 @@
 
 	@Test
 	public void isSelectionValidForValidCombinationOfFeatureAndObject() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
-		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
-				.get(0));
+		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
 		assertTrue(selector.isValid());
 	}
 
 	@Test
 	public void isSelectionValidForInvalidTargetFeaturePredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
 		selector.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
-		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
-				.get(0));
+		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
 		assertFalse(selector.isValid());
 	}
 
 	@Test
 	public void isSelectionValidForInvalidTargetObjectPredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(1));
 		selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 		selector.setTargetObject(ePackageWithTwoClasses);
@@ -71,21 +68,17 @@
 
 	@Test
 	public void isSelectionValidForValidTargetObjectButInvalidTargetFeaturePredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
-		selector.getTargetFeaturePredicates()
-				.add(hasMaxNumberOfContainments(1));
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
+		selector.getTargetFeaturePredicates().add(hasMaxNumberOfContainments(1));
 		selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
 		selector.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
-		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
-				.get(0));
+		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
 		assertFalse(selector.isValid());
 	}
 
 	@Test
 	public void isSelectionValidForInvalidTargetObjectButValidTargetFeaturePredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(0));
 		selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
 		selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
@@ -95,78 +88,64 @@
 
 	@Test
 	public void isSelectionValidForValidTargetObjectPredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(0));
 		selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
 		selector.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures());
-		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers()
-				.get(0));
+		selector.setTargetObject(ePackageWithTwoClasses.getEClassifiers().get(0));
 		assertTrue(selector.isValid());
 	}
 
 	@Test
 	public void isSelectionValidForInvalidOriginalFeatureValuePredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 		selector.setTargetObject(ePackageWithTwoClasses);
-		selector.getOriginalFeatureValuePredicates().add(
-				isListWithSpecifiedSize(0));
+		selector.getOriginalFeatureValuePredicates().add(isListWithSpecifiedSize(0));
 		assertFalse(selector.isValid());
 	}
 
 	@Test
 	public void isSelectionValidForValidOriginalFeatureValuePredicate() {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 		selector.setTargetObject(ePackageWithTwoClasses);
-		selector.getOriginalFeatureValuePredicates().add(
-				isListWithSpecifiedSize(2));
+		selector.getOriginalFeatureValuePredicates().add(isListWithSpecifiedSize(2));
 		assertTrue(selector.isValid());
 	}
 
 	@Test
 	public void findingTargetObjectByFeature() throws ESMutationException {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 
 		selector.doSelection();
 		EObject targetObject = selector.getTargetObject();
 		assertEquals(ePackageWithTwoClasses, targetObject);
-		assertEquals(E_PACKAGE.getEPackage_EClassifiers(),
-				selector.getTargetFeature());
+		assertEquals(E_PACKAGE.getEPackage_EClassifiers(), selector.getTargetFeature());
 
 		selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures());
 		selector.doSelection();
 		targetObject = selector.getTargetObject();
-		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
-				targetObject));
-		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(),
-				selector.getTargetFeature());
+		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(targetObject));
+		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), selector.getTargetFeature());
 	}
 
 	@Test
 	public void findingTargetFeatureByObject() throws ESMutationException {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.setTargetObject(ePackageWithTwoClasses);
 
 		selector.doSelection();
 		EStructuralFeature targetFeature = selector.getTargetFeature();
-		assertTrue(ePackageWithTwoClasses.eClass().getEAllStructuralFeatures()
-				.contains(targetFeature));
+		assertTrue(ePackageWithTwoClasses.eClass().getEAllStructuralFeatures().contains(targetFeature));
 		assertEquals(ePackageWithTwoClasses, selector.getTargetObject());
 	}
 
 	@Test
-	public void findingTargetFeatureAndTargetObjectByPredicates()
-			throws ESMutationException {
-		MutationTargetSelector selector = new MutationTargetSelector(
-				utilForEPackageWithTwoClasses);
+	public void findingTargetFeatureAndTargetObjectByPredicates() throws ESMutationException {
+		MutationTargetSelector selector = new MutationTargetSelector(utilForEPackageWithTwoClasses);
 		selector.getTargetFeaturePredicates().add(IS_CONTAINMENT_REFERENCE);
 		selector.getTargetObjectPredicates().add(hasMaxNumberOfContainments(0));
 
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java
index df07163..fb39b4f 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AbstractMutationTest.java
@@ -20,8 +20,8 @@
 import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.emfstore.internal.modelmutator.mutation.Mutation;
-import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorUtil;
 import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorConfiguration;
+import org.eclipse.emf.emfstore.modelmutator.ESModelMutatorUtil;
 import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
 import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
 import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
@@ -68,17 +68,14 @@
 	private TypeWithFeatureMapContainment createTestTypeModel() {
 		TestmodelFactory tFactory = TestmodelFactory.eINSTANCE;
 
-		TypeWithFeatureMapContainment root = tFactory
-				.createTypeWithFeatureMapContainment();
+		TypeWithFeatureMapContainment root = tFactory.createTypeWithFeatureMapContainment();
 		root.setName("Root");
 
-		TypeWithFeatureMapContainment child1 = tFactory
-				.createTypeWithFeatureMapContainment();
+		TypeWithFeatureMapContainment child1 = tFactory.createTypeWithFeatureMapContainment();
 		child1.setName("Child2Containment");
 		root.getSecondKeyContainment().add(child1);
 
-		TypeWithFeatureMapNonContainment child2 = tFactory
-				.createTypeWithFeatureMapNonContainment();
+		TypeWithFeatureMapNonContainment child2 = tFactory.createTypeWithFeatureMapNonContainment();
 		child2.setName("Child1NonContainment");
 		child2.getFirstKey().add(root);
 		child2.getSecondKey().add(child2);
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java
index 49dc73e..75aad0c 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AddObjectMutationTest.java
@@ -34,12 +34,10 @@
 public class AddObjectMutationTest extends AbstractMutationTest {
 
 	@Test
-	public void addObjectForGivenFeatureAndContainer()
-			throws ESMutationException {
+	public void addObjectForGivenFeatureAndContainer() throws ESMutationException {
 
-		ESMutationFactory.add(utilForEPackageWithTwoClasses)
-				.setTargetObject(ePackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+		ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetObject(ePackageWithTwoClasses)
+			.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
 
 		assertEquals(3, ePackageWithTwoClasses.getEClassifiers().size());
 	}
@@ -47,8 +45,8 @@
 	@Test
 	public void addObjectForGivenFeature() throws ESMutationException {
 
-		ESMutationFactory.add(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+		ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+			.apply();
 
 		// we only have one possible target container with the given feature
 		// so apply() should have added one new EClassifier to it
@@ -56,12 +54,10 @@
 	}
 
 	@Test
-	public void selectTargetContainerForGivenFeature()
-			throws ESMutationException {
+	public void selectTargetContainerForGivenFeature() throws ESMutationException {
 
-		ESAddObjectMutation mutation = ESMutationFactory.add(
-				utilForEPackageWithTwoClasses).setTargetFeature(
-				E_PACKAGE.getEPackage_EClassifiers());
+		ESAddObjectMutation mutation = ESMutationFactory.add(utilForEPackageWithTwoClasses)
+			.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 
 		mutation.apply();
 
@@ -70,30 +66,25 @@
 	}
 
 	@Test
-	public void selectTargetFeatureForGivenTargetContainer()
-			throws ESMutationException {
+	public void selectTargetFeatureForGivenTargetContainer() throws ESMutationException {
 
-		ESAddObjectMutation mutation = ESMutationFactory.add(
-				utilForEPackageWithTwoClasses).setTargetObject(
-				ePackageWithTwoClasses);
+		ESAddObjectMutation mutation = ESMutationFactory.add(utilForEPackageWithTwoClasses)
+			.setTargetObject(ePackageWithTwoClasses);
 
 		mutation.apply();
 
 		final EStructuralFeature targetFeature = mutation.getTargetFeature();
 		final EClass targetContainerClass = ePackageWithTwoClasses.eClass();
-		final EList<EReference> allContainmentFeatures = targetContainerClass
-				.getEAllContainments();
+		final EList<EReference> allContainmentFeatures = targetContainerClass.getEAllContainments();
 
 		assertTrue(allContainmentFeatures.contains(targetFeature));
 	}
 
 	@Test
-	public void selectTargetFeatureAndContainerForGivenEObjectToAdd()
-			throws ESMutationException {
+	public void selectTargetFeatureAndContainerForGivenEObjectToAdd() throws ESMutationException {
 
-		ESAddObjectMutation mutation = ESMutationFactory.add(
-				utilForEPackageWithTwoClasses).setEObjectToAdd(
-				E_FACTORY.createEAttribute());
+		ESAddObjectMutation mutation = ESMutationFactory.add(utilForEPackageWithTwoClasses)
+			.setEObjectToAdd(E_FACTORY.createEAttribute());
 
 		mutation.apply();
 
@@ -103,8 +94,7 @@
 
 		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), targetFeature);
 		assertEquals(E_PACKAGE.getEClass(), targetContainer.eClass());
-		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
-				realContainer));
+		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(realContainer));
 	}
 
 	@Test
@@ -116,22 +106,18 @@
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfNoValidTargetContainerIsAvailable()
-			throws ESMutationException {
+	public void throwsExceptionIfNoValidTargetContainerIsAvailable() throws ESMutationException {
 
-		ESMutationFactory.add(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
+		ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
 
 		fail("Should have thrown a Mutation Exception, because there is no valid target container.");
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfSelectionOfTargetContainerIsImpossible()
-			throws ESMutationException {
+	public void throwsExceptionIfSelectionOfTargetContainerIsImpossible() throws ESMutationException {
 
-		ESMutationFactory.add(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
-				.setTargetObject(ePackageWithTwoClasses).apply();
+		ESMutationFactory.add(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
+			.setTargetObject(ePackageWithTwoClasses).apply();
 
 		fail("Should have thrown a Mutation Exception, because there is no valid target container.");
 	}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java
index c1f10c9..803c7eb 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AllMutationTests.java
@@ -6,10 +6,9 @@
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({ AddObjectMutationTest.class, AttributeChangeMutationTest.class,
-		DeleteObjectMutationTest.class, FeatureMapKeyMutationTest.class,
-		MoveObjectMutationTest.class, MutationTargetSelectorTest.class,
-		ReferenceChangeMutationTest.class })
+@SuiteClasses({ AddObjectMutationTest.class, AttributeChangeMutationTest.class, DeleteObjectMutationTest.class,
+	FeatureMapKeyMutationTest.class, MoveObjectMutationTest.class, MutationTargetSelectorTest.class,
+	ReferenceChangeMutationTest.class })
 public class AllMutationTests {
 
 }
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java
index 64bc36d..2b5009a 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/AttributeChangeMutationTest.java
@@ -37,64 +37,49 @@
 public class AttributeChangeMutationTest extends AbstractMutationTest {
 
 	@Test
-	public void addValueForGivenAttributeAndContainer()
-			throws ESMutationException {
+	public void addValueForGivenAttributeAndContainer() throws ESMutationException {
 
-		ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
-				.setNewValue("TEST")
-				.setRandomChangeMode(ESRandomChangeMode.ADD)
-				.setTargetObject(ePackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
+		ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses).setNewValue("TEST")
+			.setRandomChangeMode(ESRandomChangeMode.ADD).setTargetObject(ePackageWithTwoClasses)
+			.setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
 
 		assertEquals("TEST", ePackageWithTwoClasses.getNsURI());
 	}
 
 	@Test
-	public void unsetSingleValuedAttributeForGivenAttributeAndContainer()
-			throws ESMutationException {
+	public void unsetSingleValuedAttributeForGivenAttributeAndContainer() throws ESMutationException {
 		ePackageWithTwoClasses.setNsURI("TEST");
 
-		ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.DELETE)
-				.setTargetObject(ePackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
+		ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.DELETE)
+			.setTargetObject(ePackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_NsURI()).apply();
 
 		assertNull(ePackageWithTwoClasses.getNsURI());
-		assertFalse(ePackageWithTwoClasses
-				.eIsSet(E_PACKAGE.getEPackage_NsURI()));
+		assertFalse(ePackageWithTwoClasses.eIsSet(E_PACKAGE.getEPackage_NsURI()));
 	}
 
 	@Test
-	public void selectTargetContainerForGivenFeature()
-			throws ESMutationException {
+	public void selectTargetContainerForGivenFeature() throws ESMutationException {
 
-		ESAttributeChangeMutation mutation = ESMutationFactory
-				.attributeChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.ADD)
-				.setTargetFeature(E_PACKAGE.getEClass_Abstract());
+		ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.ADD).setTargetFeature(E_PACKAGE.getEClass_Abstract());
 
 		mutation.apply();
 
 		assertEquals(E_PACKAGE.getEClass(), mutation.getTargetObject().eClass());
-		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
-				mutation.getTargetObject()));
+		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(mutation.getTargetObject()));
 	}
 
 	@Test
-	public void selectTargetFeatureForGivenTargetContainer()
-			throws ESMutationException {
+	public void selectTargetFeatureForGivenTargetContainer() throws ESMutationException {
 
-		ESAttributeChangeMutation mutation = ESMutationFactory
-				.attributeChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.ADD)
-				.setTargetObject(ePackageWithTwoClasses);
+		ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.ADD).setTargetObject(ePackageWithTwoClasses);
 
 		mutation.apply();
 
 		final EStructuralFeature targetFeature = mutation.getTargetFeature();
 		final EClass targetContainerClass = ePackageWithTwoClasses.eClass();
-		final EList<EAttribute> allAttributes = targetContainerClass
-				.getEAllAttributes();
+		final EList<EAttribute> allAttributes = targetContainerClass.getEAllAttributes();
 
 		assertTrue(allAttributes.contains(targetFeature));
 	}
@@ -102,9 +87,8 @@
 	@Test
 	public void addObject() throws ESMutationException {
 
-		ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(
-				utilForEPackageWithTwoClasses).setRandomChangeMode(
-				ESRandomChangeMode.ADD);
+		ESAttributeChangeMutation mutation = ESMutationFactory.attributeChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.ADD);
 
 		mutation.apply();
 
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java
index 45a41b5..b34091b 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/DeleteObjectMutationTest.java
@@ -33,12 +33,10 @@
 public class DeleteObjectMutationTest extends AbstractMutationTest {
 
 	@Test
-	public void deleteObjectForGivenFeatureAndGivenContainer()
-			throws ESMutationException {
+	public void deleteObjectForGivenFeatureAndGivenContainer() throws ESMutationException {
 
-		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setTargetObject(ePackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+		ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetObject(ePackageWithTwoClasses)
+			.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
 
 		assertEquals(1, ePackageWithTwoClasses.getEClassifiers().size());
 	}
@@ -46,8 +44,8 @@
 	@Test
 	public void deleteObjectForGivenFeature() throws ESMutationException {
 
-		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+		ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+			.apply();
 
 		// we only have one possible target container with the given feature
 		// so apply() should have added one new EClassifier to it
@@ -55,12 +53,10 @@
 	}
 
 	@Test
-	public void selectTargetContainerForGivenFeature()
-			throws ESMutationException {
+	public void selectTargetContainerForGivenFeature() throws ESMutationException {
 
-		ESDeleteObjectMutation mutation = ESMutationFactory.delete(
-				utilForEPackageWithTwoClasses).setTargetFeature(
-				E_PACKAGE.getEPackage_EClassifiers());
+		ESDeleteObjectMutation mutation = ESMutationFactory.delete(utilForEPackageWithTwoClasses)
+			.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 
 		mutation.apply();
 
@@ -71,74 +67,61 @@
 	@Test
 	public void selectTargetFeatureForGivenObject() throws ESMutationException {
 
-		ESDeleteObjectMutation mutation = ESMutationFactory.delete(
-				utilForEPackageWithTwoClasses).setTargetObject(
-				ePackageWithTwoClasses);
+		ESDeleteObjectMutation mutation = ESMutationFactory.delete(utilForEPackageWithTwoClasses)
+			.setTargetObject(ePackageWithTwoClasses);
 
 		mutation.apply();
 
 		final EStructuralFeature targetFeature = mutation.getTargetFeature();
 		final EClass targetContainerClass = ePackageWithTwoClasses.eClass();
-		final EList<EReference> allContainmentFeatures = targetContainerClass
-				.getEAllContainments();
+		final EList<EReference> allContainmentFeatures = targetContainerClass.getEAllContainments();
 		assertTrue(allContainmentFeatures.contains(targetFeature));
 	}
 
 	@Test
 	public void deleteObject() throws ESMutationException {
 
-		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setMaxNumberOfContainments(1).apply();
+		ESMutationFactory.delete(utilForEPackageWithTwoClasses).setMaxNumberOfContainments(1).apply();
 
 		assertEquals(1, getAllObjectsCount(ePackageWithTwoClasses));
 	}
 
 	@Test
-	public void deleteInGivenTargetContainerForGivenFeature()
-			throws ESMutationException {
+	public void deleteInGivenTargetContainerForGivenFeature() throws ESMutationException {
 
-		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
-				.setTargetObject(ePackageWithTwoClasses)
-				.setMaxNumberOfContainments(1).apply();
+		ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+			.setTargetObject(ePackageWithTwoClasses).setMaxNumberOfContainments(1).apply();
 
 		assertEquals(1, ePackageWithTwoClasses.getEClassifiers().size());
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfNoValidTargetContainerIsAvailable()
-			throws ESMutationException {
+	public void throwsExceptionIfNoValidTargetContainerIsAvailable() throws ESMutationException {
 
-		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
+		ESMutationFactory.delete(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEEnum_ELiterals())
+			.apply();
 
-		fail("Should have thrown a Mutation Exception, because there is "
-				+ "no valid target container.");
+		fail("Should have thrown a Mutation Exception, because there is " + "no valid target container.");
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfSelectionOfTargetContainerIsImpossible()
-			throws ESMutationException {
+	public void throwsExceptionIfSelectionOfTargetContainerIsImpossible() throws ESMutationException {
 
 		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
-				.setTargetObject(ePackageWithTwoClasses).apply();
+			.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures()).setTargetObject(ePackageWithTwoClasses)
+			.apply();
 
-		fail("Should have thrown a Mutation Exception, because there is "
-				+ "no valid target container.");
+		fail("Should have thrown a Mutation Exception, because there is " + "no valid target container.");
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfSelectionOfTargetContainerViolatesMaxNumberOfObjects()
-			throws ESMutationException {
+	public void throwsExceptionIfSelectionOfTargetContainerViolatesMaxNumberOfObjects() throws ESMutationException {
 
-		ESMutationFactory.delete(utilForEPackageWithTwoClasses)
-				.setMaxNumberOfContainments(-1)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
-				.setTargetObject(ePackageWithTwoClasses).apply();
+		ESMutationFactory.delete(utilForEPackageWithTwoClasses).setMaxNumberOfContainments(-1)
+			.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).setTargetObject(ePackageWithTwoClasses).apply();
 
 		fail("Should have thrown a Mutation Exception, because there this mutation "
-				+ "would delete more than the specified maximum number of objects.");
+			+ "would delete more than the specified maximum number of objects.");
 	}
 
 }
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java
index 73f2ef0..9afb969 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/FeatureMapKeyMutationTest.java
@@ -39,52 +39,38 @@
 	private static final TestmodelPackage TEST_MODEL_PACKAGE = TestmodelPackage.eINSTANCE;
 
 	@Test
-	public void runUnconfiguredFeatureMapKeyMutation()
-			throws ESMutationException {
-		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
-				utilForTestTypeModel);
+	public void runUnconfiguredFeatureMapKeyMutation() throws ESMutationException {
+		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
 		mutation.apply();
 
 		EStructuralFeature feature = mutation.getTargetFeature();
-		assertTrue(feature == TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapNonContainment_Map()
-				|| feature == TEST_MODEL_PACKAGE
-						.getTypeWithFeatureMapContainment_MapContainment());
+		assertTrue(feature == TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_Map()
+			|| feature == TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_MapContainment());
 	}
 
 	@Test
 	public void containmentFeatureMapKeyMutation() throws ESMutationException {
-		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
-				utilForTestTypeModel);
-		mutation.setTargetFeature(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapContainment_MapContainment());
+		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+		mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_MapContainment());
 		mutation.apply();
 
-		final EList<TestType> firstKeyContainments = testTypeModel
-				.getFirstKeyContainment();
-		final EList<TestType> secondKeyContainments = testTypeModel
-				.getSecondKeyContainment();
+		final EList<TestType> firstKeyContainments = testTypeModel.getFirstKeyContainment();
+		final EList<TestType> secondKeyContainments = testTypeModel.getSecondKeyContainment();
 
 		// originally we had one in first key and one in second key containment
 		// after the key change mutation, there should be two in either one of
 		// them
-		assertTrue((firstKeyContainments.size() == 2 && secondKeyContainments
-				.size() == 0)
-				|| (firstKeyContainments.size() == 0 && secondKeyContainments
-						.size() == 2));
+		assertTrue((firstKeyContainments.size() == 2 && secondKeyContainments.size() == 0)
+			|| (firstKeyContainments.size() == 0 && secondKeyContainments.size() == 2));
 	}
 
 	@Test
-	public void nonContainmentFeatureMapKeyMutation()
-			throws ESMutationException {
-		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
-				utilForTestTypeModel);
-		mutation.setTargetFeature(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapNonContainment_Map());
+	public void nonContainmentFeatureMapKeyMutation() throws ESMutationException {
+		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+		mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_Map());
 		mutation.apply();
 
-		final EList<TestType> firstKeyContainments = testTypeModel
-				.getFirstKeyContainment();
+		final EList<TestType> firstKeyContainments = testTypeModel.getFirstKeyContainment();
 		final TestType firstKeyContainmentsIdx0 = firstKeyContainments.get(0);
 		final TypeWithFeatureMapNonContainment mutationTarget = (TypeWithFeatureMapNonContainment) firstKeyContainmentsIdx0;
 
@@ -95,39 +81,33 @@
 		// after the key change mutation, there should be two in either one of
 		// them
 		assertTrue((firstKeyValues.size() == 2 && secondKeyValues.size() == 0)
-				|| (firstKeyValues.size() == 0 && secondKeyValues.size() == 2));
+			|| (firstKeyValues.size() == 0 && secondKeyValues.size() == 2));
 	}
 
 	@Test
 	public void getFeaturesOfFeatureMapGroupContainment() {
-		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
-				utilForTestTypeModel);
-		mutation.setTargetFeature(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapContainment_MapContainment());
-		List<EStructuralFeature> featuresOfFeatureMapGroup = mutation
-				.getFeaturesOfFeatureMapGroup();
+		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+		mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_MapContainment());
+		List<EStructuralFeature> featuresOfFeatureMapGroup = mutation.getFeaturesOfFeatureMapGroup();
 
 		assertEquals(2, featuresOfFeatureMapGroup.size());
-		assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapContainment_FirstKeyContainment()));
-		assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapContainment_SecondKeyContainment()));
+		assertTrue(featuresOfFeatureMapGroup
+			.contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_FirstKeyContainment()));
+		assertTrue(featuresOfFeatureMapGroup
+			.contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapContainment_SecondKeyContainment()));
 	}
 
 	@Test
 	public void getFeaturesOfFeatureMapGroupNonContainment() {
-		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(
-				utilForTestTypeModel);
-		mutation.setTargetFeature(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapNonContainment_Map());
-		List<EStructuralFeature> featuresOfFeatureMapGroup = mutation
-				.getFeaturesOfFeatureMapGroup();
+		FeatureMapKeyMutation mutation = new FeatureMapKeyMutation(utilForTestTypeModel);
+		mutation.setTargetFeature(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_Map());
+		List<EStructuralFeature> featuresOfFeatureMapGroup = mutation.getFeaturesOfFeatureMapGroup();
 
 		assertEquals(2, featuresOfFeatureMapGroup.size());
-		assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapNonContainment_FirstKey()));
-		assertTrue(featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE
-				.getTypeWithFeatureMapNonContainment_SecondKey()));
+		assertTrue(
+			featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_FirstKey()));
+		assertTrue(
+			featuresOfFeatureMapGroup.contains(TEST_MODEL_PACKAGE.getTypeWithFeatureMapNonContainment_SecondKey()));
 	}
 
 }
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java
index e7af942..2a98b10 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/MoveObjectMutationTest.java
@@ -65,16 +65,13 @@
 
 	@Test
 	public void moveObjectForGivenSourceFeatureAndSourceContainerAndTargetFeatureAndTargetContainer()
-			throws ESMutationException {
+		throws ESMutationException {
 
 		EAttribute attributeToMove = getEAttributeInFirstClass();
 
-		ESMutationFactory.move(utilForEPackageWithTwoClasses)
-				.setSourceObject(getFirstEClass())
-				.setSourceFeature(E_PACKAGE.getEClass_EStructuralFeatures())
-				.setTargetObject(getSecondEClass())
-				.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
-				.setEObjectToMove(attributeToMove).apply();
+		ESMutationFactory.move(utilForEPackageWithTwoClasses).setSourceObject(getFirstEClass())
+			.setSourceFeature(E_PACKAGE.getEClass_EStructuralFeatures()).setTargetObject(getSecondEClass())
+			.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures()).setEObjectToMove(attributeToMove).apply();
 
 		assertEquals(getSecondEClass(), attributeToMove.eContainer());
 	}
@@ -105,8 +102,7 @@
 	public void moveObjectForGivenFeature() throws ESMutationException {
 
 		ESMutationFactory.move(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures())
-				.apply();
+			.setTargetFeature(E_PACKAGE.getEClass_EStructuralFeatures()).apply();
 
 		assertEAttributeInFirstClassHasBeenMoved();
 	}
@@ -115,24 +111,21 @@
 		final EObject eAttributeInFirstClass = getEAttributeInFirstClass();
 		final EObject eAttributeInSecondClass = getEAttributeInSecondClass();
 		assertNull(eAttributeInFirstClass);
-		assertTrue("Attribute has not been moved",
-				eAttributeInSecondClass != null);
+		assertTrue("Attribute has not been moved", eAttributeInSecondClass != null);
 	}
 
 	@Test
 	public void setupForSourceGivenFeature() throws ESMutationException {
 		EAttribute eAttribute = getEAttributeInFirstClass();
 
-		ESMoveObjectMutation mutation = ESMutationFactory.move(
-				utilForEPackageWithTwoClasses).setSourceFeature(
-				E_PACKAGE.getEClass_EStructuralFeatures());
+		ESMoveObjectMutation mutation = ESMutationFactory.move(utilForEPackageWithTwoClasses)
+			.setSourceFeature(E_PACKAGE.getEClass_EStructuralFeatures());
 
 		mutation.apply();
 
 		assertEquals(getFirstEClass(), mutation.getSourceObject());
 		assertEquals(eAttribute, mutation.getEObjectToMove());
-		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(),
-				mutation.getTargetFeature());
+		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), mutation.getTargetFeature());
 		assertTrue(mutation.getTargetObject() == getSecondEClass());
 	}
 
@@ -140,35 +133,30 @@
 	public void setupForGivenTargetContainer() throws ESMutationException {
 		EAttribute eAttribute = getEAttributeInFirstClass();
 
-		ESMoveObjectMutation mutation = ESMutationFactory.move(
-				utilForEPackageWithTwoClasses).setTargetObject(
-				getSecondEClass());
+		ESMoveObjectMutation mutation = ESMutationFactory.move(utilForEPackageWithTwoClasses)
+			.setTargetObject(getSecondEClass());
 
 		mutation.apply();
 
 		assertEquals(getFirstEClass(), mutation.getSourceObject());
 		assertEquals(eAttribute, mutation.getEObjectToMove());
-		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(),
-				mutation.getTargetFeature());
+		assertEquals(E_PACKAGE.getEClass_EStructuralFeatures(), mutation.getTargetFeature());
 		assertEquals(getSecondEClass(), eAttribute.eContainer());
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfNoValidObjectToMoveIsAvailable()
-			throws ESMutationException {
+	public void throwsExceptionIfNoValidObjectToMoveIsAvailable() throws ESMutationException {
 
-		ESMutationFactory.move(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
+		ESMutationFactory.move(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEEnum_ELiterals()).apply();
 
 		fail("Should have thrown a Mutation Exception, because there is no valid setup.");
 	}
 
 	@Test(expected = ESMutationException.class)
-	public void throwsExceptionIfNoValidTargetContainerIsAvailable()
-			throws ESMutationException {
+	public void throwsExceptionIfNoValidTargetContainerIsAvailable() throws ESMutationException {
 
-		ESMutationFactory.move(utilForEPackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers()).apply();
+		ESMutationFactory.move(utilForEPackageWithTwoClasses).setTargetFeature(E_PACKAGE.getEPackage_EClassifiers())
+			.apply();
 
 		fail("Should have thrown a Mutation Exception, because there is no valid setup.");
 	}
diff --git a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java
index 569e232..3999149 100644
--- a/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java
+++ b/tests/org.eclipse.emf.emfstore.modelmutator.test/src/org/eclipse/emf/emfstore/modelmutator/test/ReferenceChangeMutationTest.java
@@ -33,104 +33,80 @@
 public class ReferenceChangeMutationTest extends AbstractMutationTest {
 
 	@Test
-	public void addValueForGivenReferenceAndContainer()
-			throws ESMutationException {
+	public void addValueForGivenReferenceAndContainer() throws ESMutationException {
 
-		ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.ADD)
-				.setNewReferenceValue(getFirstEClass())
-				.setTargetObject(getSecondEClass())
-				.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
+		ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.ADD)
+			.setNewReferenceValue(getFirstEClass()).setTargetObject(getSecondEClass())
+			.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
 
-		assertTrue(getSecondEClass().getESuperTypes()
-				.contains(getFirstEClass()));
+		assertTrue(getSecondEClass().getESuperTypes().contains(getFirstEClass()));
 	}
 
 	@Test
-	public void removeValueFromGivenReferenceAndContainer()
-			throws ESMutationException {
+	public void removeValueFromGivenReferenceAndContainer() throws ESMutationException {
 
 		getFirstEClass().getESuperTypes().add(getSecondEClass());
 
-		ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.DELETE)
-				.setTargetObject(getFirstEClass())
-				.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
+		ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.DELETE)
+			.setTargetObject(getFirstEClass()).setTargetFeature(E_PACKAGE.getEClass_ESuperTypes()).apply();
 
-		assertFalse(getFirstEClass().getESuperTypes().contains(
-				getSecondEClass()));
+		assertFalse(getFirstEClass().getESuperTypes().contains(getSecondEClass()));
 	}
 
 	@Test
-	public void reorderValuesInGivenReferenceAndContainer()
-			throws ESMutationException {
+	public void reorderValuesInGivenReferenceAndContainer() throws ESMutationException {
 
-		ESReferenceChangeMutation mutation = ESMutationFactory
-				.referenceChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.REORDER)
-				.setTargetObject(ePackageWithTwoClasses)
-				.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
+		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.REORDER).setTargetObject(ePackageWithTwoClasses)
+			.setTargetFeature(E_PACKAGE.getEPackage_EClassifiers());
 		final EObject firstEClass = getFirstEClass();
 		final EObject secondEClass = getSecondEClass();
 		mutation.apply();
 
-		assertEquals(0,
-				ePackageWithTwoClasses.getEClassifiers().indexOf(secondEClass));
-		assertEquals(1,
-				ePackageWithTwoClasses.getEClassifiers().indexOf(firstEClass));
+		assertEquals(0, ePackageWithTwoClasses.getEClassifiers().indexOf(secondEClass));
+		assertEquals(1, ePackageWithTwoClasses.getEClassifiers().indexOf(firstEClass));
 	}
 
 	@Test
-	public void selectTargetContainerForGivenFeature()
-			throws ESMutationException {
+	public void selectTargetContainerForGivenFeature() throws ESMutationException {
 
-		ESReferenceChangeMutation mutation = ESMutationFactory
-				.referenceChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.ADD)
-				.setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
+		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.ADD).setTargetFeature(E_PACKAGE.getEClass_ESuperTypes());
 
 		mutation.apply();
 
 		assertEquals(E_PACKAGE.getEClass(), mutation.getTargetObject().eClass());
-		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(
-				mutation.getTargetObject()));
+		assertTrue(ePackageWithTwoClasses.getEClassifiers().contains(mutation.getTargetObject()));
 	}
 
 	@Test
-	public void selectTargetFeatureForGivenTargetContainer()
-			throws ESMutationException {
+	public void selectTargetFeatureForGivenTargetContainer() throws ESMutationException {
 
-		ESReferenceChangeMutation mutation = ESMutationFactory
-				.referenceChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.ADD)
-				.setTargetObject(getFirstEClass());
+		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.ADD).setTargetObject(getFirstEClass());
 
 		mutation.apply();
 
-		assertEquals(E_PACKAGE.getEClass_ESuperTypes(),
-				mutation.getTargetFeature());
+		assertEquals(E_PACKAGE.getEClass_ESuperTypes(), mutation.getTargetFeature());
 	}
 
 	@Test
 	public void unconfiguredAdd() throws ESMutationException {
 
-		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(
-				utilForEPackageWithTwoClasses).setRandomChangeMode(
-				ESRandomChangeMode.ADD);
+		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.ADD);
 
 		mutation.apply();
 
-		assertTrue(mutation.getTargetObject() == getFirstEClass()
-				|| mutation.getTargetObject() == getSecondEClass());
-		assertEquals(E_PACKAGE.getEClass_ESuperTypes(),
-				mutation.getTargetFeature());
+		assertTrue(mutation.getTargetObject() == getFirstEClass() || mutation.getTargetObject() == getSecondEClass());
+		assertEquals(E_PACKAGE.getEClass_ESuperTypes(), mutation.getTargetFeature());
 	}
 
 	@Test(expected = ESMutationException.class)
 	public void unconfiguredDelete() throws ESMutationException {
 
-		ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
-				.setRandomChangeMode(ESRandomChangeMode.DELETE).apply();
+		ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses).setRandomChangeMode(ESRandomChangeMode.DELETE)
+			.apply();
 
 		fail("Should have thrown an exception since there is no object to delete from cross-reference");
 	}
@@ -139,15 +115,13 @@
 	public void unconfiguredDelete_2() throws ESMutationException {
 		getFirstEClass().getESuperTypes().add(getSecondEClass());
 
-		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(
-				utilForEPackageWithTwoClasses).setRandomChangeMode(
-				ESRandomChangeMode.DELETE);
+		ESReferenceChangeMutation mutation = ESMutationFactory.referenceChange(utilForEPackageWithTwoClasses)
+			.setRandomChangeMode(ESRandomChangeMode.DELETE);
 
 		mutation.apply();
 
 		assertEquals(getFirstEClass(), mutation.getTargetObject());
-		assertEquals(E_PACKAGE.getEClass_ESuperTypes(),
-				mutation.getTargetFeature());
+		assertEquals(E_PACKAGE.getEClass_ESuperTypes(), mutation.getTargetFeature());
 	}
 
 	private EClass getFirstEClass() {
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..f548abb
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+
+encoding//model/etypes.ecore=UTF-8
+
+
+encoding/<project>=UTF-8
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 0000000..5a0ad22
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs
index 44217f8..edbd6f6 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,418 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

+eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.recreateModifiedClassFileInOutputFolder=ignore
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=error
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=warning
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,LOW,LOW,LOW,LOW,LOW,NORMAL
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX,PERF,MEM,POLISH,@generated NOT,@ADDED,APITODO
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=true
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=true
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=120
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=false
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.launching.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.launching.prefs
new file mode 100644
index 0000000..3bb2352
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE=ignore
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 0000000..791508d
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,115 @@
+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
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.ltk.core.refactoring.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.ltk.core.refactoring.prefs
new file mode 100644
index 0000000..864e30f
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.ltk.core.refactoring.prefs
@@ -0,0 +1,3 @@
+#Thu Feb 04 09:44:24 CET 2010
+eclipse.preferences.version=1
+org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.m2e.core.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.api.tools.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.api.tools.prefs
new file mode 100644
index 0000000..e4e3c00
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.api.tools.prefs
@@ -0,0 +1,97 @@
+ANNOTATION_ELEMENT_TYPE_ADDED_METHOD_WITHOUT_DEFAULT_VALUE=Error
+ANNOTATION_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_FIELD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_METHOD=Error
+ANNOTATION_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_API_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_REEXPORTED_TYPE=Error
+API_COMPONENT_ELEMENT_TYPE_REMOVED_TYPE=Error
+API_USE_SCAN_FIELD_SEVERITY=Error
+API_USE_SCAN_METHOD_SEVERITY=Error
+API_USE_SCAN_TYPE_SEVERITY=Error
+CLASS_ELEMENT_TYPE_ADDED_METHOD=Error
+CLASS_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+CLASS_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CLASS_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+CLASS_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+CLASS_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+CLASS_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+CLASS_ELEMENT_TYPE_REMOVED_CONSTRUCTOR=Error
+CLASS_ELEMENT_TYPE_REMOVED_FIELD=Error
+CLASS_ELEMENT_TYPE_REMOVED_METHOD=Error
+CLASS_ELEMENT_TYPE_REMOVED_SUPERCLASS=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+CLASS_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+CONSTRUCTOR_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+CONSTRUCTOR_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+ENUM_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+ENUM_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+ENUM_ELEMENT_TYPE_REMOVED_ENUM_CONSTANT=Error
+ENUM_ELEMENT_TYPE_REMOVED_FIELD=Error
+ENUM_ELEMENT_TYPE_REMOVED_METHOD=Error
+ENUM_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+FIELD_ELEMENT_TYPE_ADDED_VALUE=Error
+FIELD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+FIELD_ELEMENT_TYPE_CHANGED_FINAL_TO_NON_FINAL_STATIC_CONSTANT=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+FIELD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+FIELD_ELEMENT_TYPE_CHANGED_TYPE=Error
+FIELD_ELEMENT_TYPE_CHANGED_VALUE=Error
+FIELD_ELEMENT_TYPE_REMOVED_TYPE_ARGUMENT=Error
+FIELD_ELEMENT_TYPE_REMOVED_VALUE=Error
+ILLEGAL_EXTEND=Warning
+ILLEGAL_IMPLEMENT=Warning
+ILLEGAL_INSTANTIATE=Warning
+ILLEGAL_OVERRIDE=Warning
+ILLEGAL_REFERENCE=Warning
+INTERFACE_ELEMENT_TYPE_ADDED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_SUPER_INTERFACE_WITH_METHODS=Error
+INTERFACE_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_CONTRACTED_SUPERINTERFACES_SET=Error
+INTERFACE_ELEMENT_TYPE_CHANGED_TYPE_CONVERSION=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_FIELD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_METHOD=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_MEMBER=Error
+INTERFACE_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+INVALID_JAVADOC_TAG=Warning
+INVALID_REFERENCE_IN_SYSTEM_LIBRARIES=Error
+LEAK_EXTEND=Warning
+LEAK_FIELD_DECL=Warning
+LEAK_IMPLEMENT=Warning
+LEAK_METHOD_PARAM=Warning
+LEAK_METHOD_RETURN_TYPE=Warning
+METHOD_ELEMENT_TYPE_ADDED_RESTRICTIONS=Error
+METHOD_ELEMENT_TYPE_ADDED_TYPE_PARAMETER=Error
+METHOD_ELEMENT_TYPE_CHANGED_DECREASE_ACCESS=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_ABSTRACT_TO_ABSTRACT=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_FINAL_TO_FINAL=Error
+METHOD_ELEMENT_TYPE_CHANGED_NON_STATIC_TO_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_STATIC_TO_NON_STATIC=Error
+METHOD_ELEMENT_TYPE_CHANGED_VARARGS_TO_ARRAY=Error
+METHOD_ELEMENT_TYPE_REMOVED_ANNOTATION_DEFAULT_VALUE=Error
+METHOD_ELEMENT_TYPE_REMOVED_TYPE_PARAMETER=Error
+MISSING_EE_DESCRIPTIONS=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_ADDED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_CHANGED_INTERFACE_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_CLASS_BOUND=Error
+TYPE_PARAMETER_ELEMENT_TYPE_REMOVED_INTERFACE_BOUND=Error
+UNUSED_PROBLEM_FILTERS=Ignore
+automatically_removed_unused_problem_filters=Disabled
+eclipse.preferences.version=1
+incompatible_api_component_version=Error
+incompatible_api_component_version_include_major_without_breaking_change=Disabled
+incompatible_api_component_version_include_minor_without_api_change=Disabled
+invalid_since_tag_version=Error
+malformed_since_tag=Error
+missing_since_tag=Error
+report_api_breakage_when_major_version_incremented=Disabled
+report_resolution_errors_api_component=Warning
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.prefs
new file mode 100644
index 0000000..0bbee3c
--- /dev/null
+++ b/tests/org.eclipse.emf.emfstore.performance.test/.settings/org.eclipse.pde.prefs
@@ -0,0 +1,32 @@
+compilers.f.unresolved-features=1
+compilers.f.unresolved-plugins=1
+compilers.incompatible-environment=1
+compilers.p.build=1
+compilers.p.build.bin.includes=1
+compilers.p.build.encodings=2
+compilers.p.build.java.compiler=2
+compilers.p.build.java.compliance=1
+compilers.p.build.missing.output=2
+compilers.p.build.output.library=1
+compilers.p.build.source.library=1
+compilers.p.build.src.includes=1
+compilers.p.deprecated=1
+compilers.p.discouraged-class=1
+compilers.p.internal=1
+compilers.p.missing-packages=1
+compilers.p.missing-version-export-package=1
+compilers.p.missing-version-import-package=1
+compilers.p.missing-version-require-bundle=1
+compilers.p.no-required-att=0
+compilers.p.not-externalized-att=2
+compilers.p.unknown-attribute=1
+compilers.p.unknown-class=1
+compilers.p.unknown-element=1
+compilers.p.unknown-identifier=1
+compilers.p.unknown-resource=1
+compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-import=0
+compilers.s.create-docs=false
+compilers.s.doc-folder=doc
+compilers.s.open-tags=1
+eclipse.preferences.version=1
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java
index f86a998..c1823a3 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/MemoryMeter.java
@@ -21,7 +21,7 @@
 			while (!stop) {
 				if (active) {
 					long usedMemory = Runtime.getRuntime().totalMemory()
-							- Runtime.getRuntime().freeMemory();
+						- Runtime.getRuntime().freeMemory();
 					if (usedMemory > maxUsedMemory) {
 						maxUsedMemory = usedMemory;
 					}
@@ -40,7 +40,7 @@
 	public long stopMeasurements() {
 		active = false;
 		long usedMemory = Runtime.getRuntime().totalMemory()
-				- Runtime.getRuntime().freeMemory();
+			- Runtime.getRuntime().freeMemory();
 		long curMaxMemory = maxUsedMemory;
 		if (usedMemory > curMaxMemory) {
 			curMaxMemory = usedMemory;
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
index 55b93e9..b056b90 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/PerformanceTest.java
@@ -41,7 +41,6 @@
  * @author Dmitry Litvinov
  */
 public class PerformanceTest extends ESTestWithLoggedInUserMock {
-	
 
 	private static final int PROJECTSIZE = 10000;
 	private static final int NR_OF_CHANGES = 100;
@@ -107,9 +106,9 @@
 			memoryMeter.startMeasurements();
 			memBefore[i] = usedMemory();
 			long time = System.currentTimeMillis();
-			
+
 			ProjectUtil.share(getUsersession(), getLocalProject());
-			
+
 			times[i] = (System.currentTimeMillis() - time) / 1000.0;
 
 			memAfter[i] = usedMemory();
@@ -144,7 +143,7 @@
 	public void testCheckoutProject() throws ESException {
 
 		ProjectUtil.share(getUsersession(), getLocalProject());
-		
+
 		long memAfterThreshold = 0;
 		for (int i = 0; i < NUM_ITERATIONS; i++) {
 			memoryMeter.startMeasurements();
@@ -183,9 +182,9 @@
 	public void testCommitAndUpdateProject() throws ESException {
 
 		getLocalProject().shareProject(nullMonitor());
-	
+
 		final ESLocalProject checkout = ProjectUtil.checkout(getLocalProject());
-		
+
 		double[] modelChangeTimes = new double[NUM_ITERATIONS];
 		double[] commitTimes = new double[NUM_ITERATIONS];
 		double[] updateTimes = new double[NUM_ITERATIONS];
@@ -209,7 +208,8 @@
 			memAfterMut[i] = usedMemory();
 			ModelUtil.logInfo("change model-  iteration #" + (i + 1) + ": time=" + modelChangeTimes[i]
 				+ " memory used before:" + memBeforeMut[i] / 1024 / 1024 + "MB, during: " + memDuringMut[i] / 1024
-				/ 1024 + "MB, after: " + memAfterMut[i] / 1024 / 1024 + "MB");
+					/ 1024
+				+ "MB, after: " + memAfterMut[i] / 1024 / 1024 + "MB");
 
 			System.out.println("VERSION BEFORE commit:" + getLocalProject().getBaseVersion().getIdentifier());
 			time = System.currentTimeMillis();
@@ -223,7 +223,8 @@
 			memAfterCommit[i] = usedMemory();
 			ModelUtil.logInfo("commit project - iteration #" + (i + 1) + ": time=" + commitTimes[i]
 				+ ", memory used before: " + memAfterMut[i] / 1024 / 1024 + "MB, during: " + memDuringCommit[i] / 1024
-				/ 1024 + "MB, after: " + memAfterCommit[i] / 1024 / 1024 + "MB");
+					/ 1024
+				+ "MB, after: " + memAfterCommit[i] / 1024 / 1024 + "MB");
 			if (i > 0 && memAfter[i] > memAfterThreshold * ACCEPTED_VARIANCE) {
 				fail();
 			}
@@ -242,7 +243,8 @@
 			memAfterUpdate[i] = usedMemory();
 			ModelUtil.logInfo("update project - iteration #" + (i + 1) + ": time=" + updateTimes[i]
 				+ ", memory used before: " + memAfterCommit[i] / 1024 / 1024 + "MB, during: " + memDuringUpdate[i]
-					/ 1024 / 1024 + "MB, after: " + memAfterUpdate[i] / 1024 / 1024 + "MB");
+					/ 1024 / 1024
+				+ "MB, after: " + memAfterUpdate[i] / 1024 / 1024 + "MB");
 
 			if (i > 0 && memAfter[i] > memAfterThreshold * ACCEPTED_VARIANCE) {
 				fail();
@@ -270,17 +272,17 @@
 		Runtime.getRuntime().gc();
 		return Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory();
 	}
-	
+
 	private static IProgressMonitor nullMonitor() {
 		return new NullProgressMonitor();
 	}
-	
+
 	public void generateModels(final ProjectSpace projectSpace, int numberOfModleElements) {
 		lastSeed = lastSeed == seed ? seed + 1 : seed;
 		final ESModelMutatorConfiguration mmc = new ESModelMutatorConfiguration(
-				ESModelMutatorUtil.getEPackage(MODEL_KEY),
-				projectSpace.getProject(), lastSeed);
-		
+			ESModelMutatorUtil.getEPackage(MODEL_KEY),
+			projectSpace.getProject(), lastSeed);
+
 		mmc.setMaxDeleteCount(1);
 		mmc.setUseEcoreUtilDelete(false);
 		mmc.setMinObjectsCount(numberOfModleElements);
@@ -288,22 +290,22 @@
 		Collection<EStructuralFeature> features = new ArrayList<EStructuralFeature>();
 		features.add(org.eclipse.emf.emfstore.internal.common.model.ModelPackage.eINSTANCE.getProject_CutElements());
 		mmc.seteStructuralFeaturesToIgnore(features);
-		
+
 		RunESCommand.run(new ESVoidCallable() {
 			@Override
 			public void run() {
 				ESDefaultModelMutator.generateModel(mmc);
 			}
 		});
-		
-//		System.out.println("Number of changes: " + projectSpace.getOperations().size());
+
+		// System.out.println("Number of changes: " + projectSpace.getOperations().size());
 	}
 
 	public void changeModel(final ProjectSpace prjSpace, final int nrOfChanges) {
 		lastSeed = lastSeed == seed ? seed + 1 : seed;
 		final ESModelMutatorConfiguration mmc = new ESModelMutatorConfiguration(
-						ESModelMutatorUtil.getEPackage(MODEL_KEY),
-						prjSpace.getProject(), lastSeed);
+			ESModelMutatorUtil.getEPackage(MODEL_KEY),
+			prjSpace.getProject(), lastSeed);
 		mmc.setMaxDeleteCount(1);
 		mmc.setUseEcoreUtilDelete(false);
 		mmc.setMinObjectsCount(1);
@@ -314,9 +316,9 @@
 		List<EPackage> packages = new ArrayList<EPackage>();
 		packages.add(BowlingPackage.eINSTANCE);
 		mmc.setModelPackages(packages);
-		
+
 		long time = System.currentTimeMillis();
-		RunESCommand.run(new ESVoidCallable() {			
+		RunESCommand.run(new ESVoidCallable() {
 			@Override
 			public void run() {
 				mmc.setMinObjectsCount(nrOfChanges);
@@ -324,6 +326,6 @@
 			}
 		});
 		System.out.println("Changed model: " + (System.currentTimeMillis() - time) / 1000.0 + "sec");
-//		System.out.println("Number of changes: " + prjSpace.getOperations().size());
+		// System.out.println("Number of changes: " + prjSpace.getOperations().size());
 	}
 }
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
index 2bd398c..07d1860 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/MemoryLoadTest.java
@@ -58,7 +58,7 @@
 													// be kept
 
 	private static final Logger LOGGER = Logger
-			.getLogger("org.eclipse.emf.emfstore.client.test");
+		.getLogger("org.eclipse.emf.emfstore.client.test");
 	private long currentProjectCount; // The current project count.
 	private ESModelMutatorConfiguration currentProjectConfiguration;
 	private static final ESSystemOutProgressMonitor MONITOR = new ESSystemOutProgressMonitor();
@@ -70,7 +70,7 @@
 	/** Rule for deleting all remote projects. */
 	@Rule
 	public NoRemoteProjectRule noRemoteProjectRule = new NoRemoteProjectRule(
-			runningEMFStoreRule);
+		runningEMFStoreRule);
 
 	/**
 	 * Starts the EMFstore.
@@ -84,7 +84,7 @@
 	 */
 	@BeforeClass
 	public static void before() throws IOException, FatalESException,
-			ESException {
+		ESException {
 		runningEMFStoreRule.before();
 	}
 
@@ -110,18 +110,18 @@
 	}
 
 	private void shareProjectsLoadTest(int minProjectSize, int projectCount)
-			throws ESException {
+		throws ESException {
 		for (int i = 0; i < projectCount; i++) {
 			final ESLocalProject project = generateRandomProject(minProjectSize);
 			long time = System.nanoTime();
 			project.shareProject(runningEMFStoreRule.defaultSession(), null);
 			time = System.nanoTime() - time;
 			log("Shared Project: " + project.getProjectName() + " ,Memory: "
-					+ usedMemoryInMib() + " MiB");
+				+ usedMemoryInMib() + " MiB");
 
 			deleteLocallyIfNeeded(project);
 			log("Shared Project: " + project.getProjectName() + " ,Memory: "
-					+ usedMemoryInMib() + " MiB");
+				+ usedMemoryInMib() + " MiB");
 		}
 	}
 
@@ -138,7 +138,7 @@
 	}
 
 	private void shareCheckoutProjectsLoadTest(int minProjectSize,
-			int projectCount) throws ESException {
+		int projectCount) throws ESException {
 		final long start = currentProjectCount;
 		final int[] sizes = new int[projectCount];
 
@@ -150,22 +150,22 @@
 			sizes[i] = project.getAllModelElements().size();
 
 			log("Shared Project: " + project.getProjectName() + " ,Memory: "
-					+ usedMemoryInMib() + " MiB");
+				+ usedMemoryInMib() + " MiB");
 		}
 
 		int i = 0;
 		for (final ESRemoteProject remoteProject : runningEMFStoreRule.server()
-				.getRemoteProjects(runningEMFStoreRule.defaultSession())) {
+			.getRemoteProjects(runningEMFStoreRule.defaultSession())) {
 			final ESLocalProject project = remoteProject.checkout(
-					"Generated project_" + (start + i), MONITOR);
+				"Generated project_" + (start + i), MONITOR);
 			assertEquals("Generated project_" + (start + i),
-					project.getProjectName());
+				project.getProjectName());
 			// Assert.assertEquals(sizes[i],
 			// project.getAllModelElements().size());
 
 			deleteLocallyIfNeeded(project);
 			log("Checked out Project: " + project.getProjectName() + "Memory: "
-					+ usedMemoryInMib() + " MiB");
+				+ usedMemoryInMib() + " MiB");
 			i++;
 		}
 
@@ -184,7 +184,7 @@
 	}
 
 	private void commitLoadTest(int minProjectSize, int projectCount,
-			int historySize, int minChangeSize) throws ESException {
+		int historySize, int minChangeSize) throws ESException {
 		for (int i = 0; i < projectCount; i++) {
 
 			final ESLocalProject project = generateRandomProject(minProjectSize);
@@ -195,8 +195,8 @@
 				commitProject(project);
 
 				log("Committed Change: " + z + " of Project "
-						+ project.getProjectName() + " ,Memory: "
-						+ usedMemoryInMib() + " MiB");
+					+ project.getProjectName() + " ,Memory: "
+					+ usedMemoryInMib() + " MiB");
 			}
 			deleteLocallyIfNeeded(project);
 		}
@@ -216,8 +216,8 @@
 	}
 
 	private void commitCheckoutLoadTest(int minProjectSize, int projectCount,
-			int historySize, int minChangeSize, int checkoutStep)
-			throws ESException {
+		int historySize, int minChangeSize, int checkoutStep)
+		throws ESException {
 
 		for (int i = 0; i < projectCount; i++) {
 
@@ -230,8 +230,8 @@
 				mutateProject(project, minChangeSize);
 				versions.add(commitProject(project));
 				log("Committed Change: " + z + " of Project "
-						+ project.getProjectName() + " ,Memory: "
-						+ usedMemoryInMib() + " MiB");
+					+ project.getProjectName() + " ,Memory: "
+					+ usedMemoryInMib() + " MiB");
 
 			}
 			deleteLocallyIfNeeded(project);
@@ -240,12 +240,12 @@
 				log("Checking out version: " + versions.get(x).getIdentifier());
 
 				final ESLocalProject projectCopy = project.getRemoteProject()
-						.checkout(project.getProjectName() + "_Copy" + x,
-								runningEMFStoreRule.defaultSession(),
-								versions.get(x), MONITOR);
+					.checkout(project.getProjectName() + "_Copy" + x,
+						runningEMFStoreRule.defaultSession(),
+						versions.get(x), MONITOR);
 
 				log("Checked out version: " + versions.get(x).getIdentifier()
-						+ " ,Memory: " + usedMemoryInMib() + " MiB");
+					+ " ,Memory: " + usedMemoryInMib() + " MiB");
 				deleteLocallyIfNeeded(projectCopy);
 			}
 		}
@@ -263,7 +263,7 @@
 	}
 
 	private void updateLoadTest(int minProjectSize, int projectCount,
-			int historySize, int minChangeSize) throws ESException {
+		int historySize, int minChangeSize) throws ESException {
 
 		for (int i = 0; i < projectCount; i++) {
 
@@ -271,10 +271,10 @@
 			project.shareProject(runningEMFStoreRule.defaultSession(), null);
 
 			final ESLocalProject projectSecondCheckout = project
-					.getRemoteProject().checkout(
-							project.getProjectName() + "_SecondCheckout_" + i,
-							runningEMFStoreRule.defaultSession(),
-							project.getBaseVersion(), null);
+				.getRemoteProject().checkout(
+					project.getProjectName() + "_SecondCheckout_" + i,
+					runningEMFStoreRule.defaultSession(),
+					project.getBaseVersion(), null);
 
 			final List<ESVersionSpec> versions = new ArrayList<ESVersionSpec>();
 
@@ -287,7 +287,7 @@
 			deleteLocallyIfNeeded(project);
 
 			projectSecondCheckout.update(
-					versions.get((versions.size() - 1) / 2), null, null);
+				versions.get((versions.size() - 1) / 2), null, null);
 			projectSecondCheckout.update(versions.get(1), null, null);
 			projectSecondCheckout.update(null);
 			deleteLocallyIfNeeded(projectSecondCheckout);
@@ -309,7 +309,7 @@
 	}
 
 	private void commitGetChangesLoadTest(int minProjectSize, int projectCount,
-			int historySize, int minChangeSize) throws ESException {
+		int historySize, int minChangeSize) throws ESException {
 
 		for (int i = 0; i < projectCount; i++) {
 
@@ -321,11 +321,11 @@
 			for (int z = 0; z < historySize; z++) {
 				mutateProject(project, minChangeSize);
 				versions.add(((ESPrimaryVersionSpecImpl) commitProject(project))
-						.toInternalAPI());
+					.toInternalAPI());
 
 			}
 			((ESLocalProjectImpl) project).toInternalAPI().getChanges(
-					versions.get(0), versions.get(versions.size() - 1));
+				versions.get(0), versions.get(versions.size() - 1));
 
 			deleteLocallyIfNeeded(project);
 			log("Memory: " + usedMemoryInMib() + " MiB");
@@ -335,16 +335,16 @@
 
 	private long usedMemoryInMib() {
 		return Runtime.getRuntime().totalMemory()
-				- Runtime.getRuntime().freeMemory() >> 20;
+			- Runtime.getRuntime().freeMemory() >> 20;
 	}
 
 	private ESLocalProject generateRandomProject(int minProjectSize) {
 		final String projectName = "Generated project_" + currentProjectCount;
 		final Project project = org.eclipse.emf.emfstore.internal.common.model.ModelFactory.eINSTANCE
-				.createProject();
+			.createProject();
 
 		final ESModelMutatorConfiguration config = createModelMutatorConfigurationRandom(
-				modelKey, project, minProjectSize, seed);
+			modelKey, project, minProjectSize, seed);
 
 		new EMFStoreCommand() {
 			@Override
@@ -354,7 +354,7 @@
 		}.run(false);
 
 		final ProjectSpace projectSpace = ((ESWorkspaceImpl) runningEMFStoreRule
-				.connectedWorkspace()).toInternalAPI().importProject(project,
+			.connectedWorkspace()).toInternalAPI().importProject(project,
 				projectName, "");
 
 		currentProjectCount++;
@@ -364,12 +364,13 @@
 	private void mutateProject(final ESLocalProject project, int minChangeSize) {
 
 		if (currentProjectConfiguration == null
-				|| currentProjectConfiguration.getRootEObject() != ((ESLocalProjectImpl) project)
-						.toInternalAPI().getProject()) {
+			|| currentProjectConfiguration.getRootEObject() != ((ESLocalProjectImpl) project)
+				.toInternalAPI().getProject()) {
 
 			currentProjectConfiguration = createModelMutatorConfigurationRandom(
-					modelKey, ((ESLocalProjectImpl) project).toInternalAPI()
-							.getProject(), minChangeSize, seed);
+				modelKey, ((ESLocalProjectImpl) project).toInternalAPI()
+					.getProject(),
+				minChangeSize, seed);
 		}
 		currentProjectConfiguration.setMinObjectsCount(minChangeSize);
 
@@ -381,16 +382,16 @@
 				final long time = System.currentTimeMillis();
 				ESDefaultModelMutator.changeModel(mmc);
 				System.out.println("Changed model: "
-						+ (System.currentTimeMillis() - time) / 1000.0 + "sec");
+					+ (System.currentTimeMillis() - time) / 1000.0 + "sec");
 			}
 		}.run(false);
 	}
 
 	private ESModelMutatorConfiguration createModelMutatorConfigurationRandom(
-			String modelKey, EObject rootObject, int minObjectsCount, long seed) {
+		String modelKey, EObject rootObject, int minObjectsCount, long seed) {
 
 		final ESModelMutatorConfiguration config = new ESModelMutatorConfiguration(
-				ESModelMutatorUtil.getEPackage(modelKey), rootObject, seed);
+			ESModelMutatorUtil.getEPackage(modelKey), rootObject, seed);
 
 		config.setIgnoreAndLog(false);
 		config.setMinObjectsCount(minObjectsCount);
@@ -398,7 +399,7 @@
 		final List<EStructuralFeature> eStructuralFeaturesToIgnore = new ArrayList<EStructuralFeature>();
 
 		config.setEditingDomain(((ESWorkspaceImpl) runningEMFStoreRule
-				.connectedWorkspace()).toInternalAPI().getEditingDomain());
+			.connectedWorkspace()).toInternalAPI().getEditingDomain());
 		config.seteStructuralFeaturesToIgnore(eStructuralFeaturesToIgnore);
 		return config;
 	}
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java
index 3c47b4c..e63d564 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/NoRemoteProjectRule.java
@@ -56,7 +56,7 @@
 	}
 
 	private void deleteRemoteProjects() throws IOException, FatalESException,
-			ESException {
+		ESException {
 		for (ESRemoteProject project : rule.server().getRemoteProjects()) {
 			project.delete(rule.defaultSession(), new NullProgressMonitor());
 		}
diff --git a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java
index 21b1f58..af74798 100644
--- a/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java
+++ b/tests/org.eclipse.emf.emfstore.performance.test/src/org/eclipse/emf/emfstore/performance/test/memory/RunningEMFStoreRule.java
@@ -78,13 +78,13 @@
 
 		workspace = ESWorkspaceProvider.INSTANCE.getWorkspace();
 		server = ESServer.FACTORY.createServer("RunningEMFStoreRuleStore",
-				"localhost", 8080, KeyStoreManager.DEFAULT_CERTIFICATE);
+			"localhost", 8080, KeyStoreManager.DEFAULT_CERTIFICATE);
 		server = workspace.addServer(server);
 
 		startEMFStore();
 		session = server.login("super", "super");
 		((ESWorkspaceImpl) workspace).toInternalAPI().getUsersessions()
-				.add(((ESUsersessionImpl) session).toInternalAPI());
+			.add(((ESUsersessionImpl) session).toInternalAPI());
 	}
 
 	/**
@@ -96,7 +96,7 @@
 	protected void after() {
 		stopEMFStore();
 		((ESWorkspaceImpl) workspace).toInternalAPI().getUsersessions()
-				.remove(((ESUsersessionImpl) session).toInternalAPI());
+			.remove(((ESUsersessionImpl) session).toInternalAPI());
 		if (server.getName().equals("RunningEMFStoreRuleStore")) {
 			try {
 				workspace.removeServer(server);
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java
index 26bb0ee..43ca3e2 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/AddInitialParticipantTest.java
@@ -54,7 +54,7 @@
 		startEMFStoreWithPAProperties(
 			ESProjectAdminPrivileges.ShareProject,
 			ESProjectAdminPrivileges.AssignRoleToOrgUnit // needed for share
-			);
+		);
 	}
 
 	@Test(expected = ESException.class)
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java
index 53d3f38..119a470 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/CreateUserWithPasswordTests.java
@@ -27,7 +27,8 @@
 import org.junit.Test;
 
 /**
- * Test the {@link ESProjectAdminPrivileges#CreateUser} and {@link ESProjectAdminPrivileges#ChangeUserPassword} privileges of a
+ * Test the {@link ESProjectAdminPrivileges#CreateUser} and {@link ESProjectAdminPrivileges#ChangeUserPassword}
+ * privileges of a
  * {@link org.eclipse.emf.emfstore.internal.server.model.accesscontrol.roles.ProjectAdminRole ProjectAdminRole}.
  * 
  * @author emueller
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java
index 113d91d..8182c96 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/accesscontrol/test/DeleteOrgUnitTest.java
@@ -123,14 +123,10 @@
 		makeUserPA();
 
 		final ACOrgUnitId newUserId = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
-		final ProjectId secondProjectId =
-			ESGlobalProjectIdImpl.class.cast(
-				ProjectUtil.share(getUsersession(), getLocalProject())
-				).toInternalAPI();
-		final ProjectId thirdProjectId =
-			ESGlobalProjectIdImpl.class.cast(
-				ProjectUtil.share(getUsersession(), getLocalProject())
-				).toInternalAPI();
+		final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
+			ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
+		final ProjectId thirdProjectId = ESGlobalProjectIdImpl.class.cast(
+			ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
 
 		getAdminBroker().changeRole(
 			secondProjectId,
@@ -155,8 +151,7 @@
 
 		final ACOrgUnitId newUser = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
 		final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
-			ProjectUtil.share(getUsersession(), getLocalProject())
-			).toInternalAPI();
+			ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
 
 		getAdminBroker().changeRole(
 			secondProjectId,
@@ -183,10 +178,8 @@
 		makeUserPA();
 
 		final ACOrgUnitId newUser = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
-		final ProjectId secondProjectId =
-			ESGlobalProjectIdImpl.class.cast(
-				ProjectUtil.share(getUsersession(), getLocalProject())
-				).toInternalAPI();
+		final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
+			ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
 
 		getAdminBroker().changeRole(
 			secondProjectId,
@@ -203,8 +196,7 @@
 
 		final ACOrgUnitId newUser = ServerUtil.createUser(getSuperUsersession(), getNewUsername());
 		final ProjectId secondProjectId = ESGlobalProjectIdImpl.class.cast(
-			ProjectUtil.share(getUsersession(), getLocalProject())
-			).toInternalAPI();
+			ProjectUtil.share(getUsersession(), getLocalProject())).toInternalAPI();
 		getAdminBroker().changeRole(
 			secondProjectId,
 			newUser,
diff --git a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java
index 2b07963..5a6a01a 100644
--- a/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java
+++ b/tests/org.eclipse.emf.emfstore.server.test/src/org/eclipse/emf/emfstore/server/test/InvalidArgumentsTest.java
@@ -166,7 +166,7 @@
 		try {
 			testAllInvalidCombinations(connectionManager.getClass().getMethod("createVersion", //$NON-NLS-1$
 				new Class[] { SessionId.class, ProjectId.class, PrimaryVersionSpec.class, AbstractChangePackage.class,
-				BranchVersionSpec.class, PrimaryVersionSpec.class, LogMessage.class }));
+					BranchVersionSpec.class, PrimaryVersionSpec.class, LogMessage.class }));
 		} catch (final SecurityException e) {
 			throw new ESException(e);
 		} catch (final NoSuchMethodException e) {
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java
index b356c34..3a53de0 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ComparingESTest.java
@@ -73,8 +73,8 @@
 		RunESCommand.run(new Callable<Void>() {
 			public Void call() throws Exception {
 				if (isCompareAtEnd) {
-					final ESCloseableIterable<AbstractOperation> operations =
-						getProjectSpace().getLocalChangePackage().operations();
+					final ESCloseableIterable<AbstractOperation> operations = getProjectSpace().getLocalChangePackage()
+						.operations();
 					try {
 						clonedProjectSpace.applyOperations(operations.iterable(), false);
 					} finally {
@@ -116,7 +116,8 @@
 			clonedProjectSpace.save();
 
 			assertTrue(
-				MessageFormat.format("Projects are not equal.\n\n{0}\n\n{1}", projectString, clonedProjectString), areEqual); //$NON-NLS-1$
+				MessageFormat.format("Projects are not equal.\n\n{0}\n\n{1}", projectString, clonedProjectString), //$NON-NLS-1$
+				areEqual);
 		}
 		super.after();
 	}
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java
index 03090ba..1da4dbd 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/cases/ESTest.java
@@ -89,8 +89,7 @@
 		}
 		CommonUtil.setTesting(true);
 		final ESLocalProject project = Create.project(ProjectUtil.defaultName());
-		projectSpace = (ProjectSpaceBase) ESLocalProjectImpl.class.cast(project
-			).toInternalAPI();
+		projectSpace = (ProjectSpaceBase) ESLocalProjectImpl.class.cast(project).toInternalAPI();
 	}
 
 	@After
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
index 1e83511..8057880 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/mocks/ConnectionMock.java
@@ -114,7 +114,7 @@
 		final PrimaryVersionSpec baseVersionSpec, final AbstractChangePackage changePackage,
 		final BranchVersionSpec targetBranch,
 		final PrimaryVersionSpec sourceVersion, final LogMessage logMessage)
-			throws ESException, InvalidVersionSpecException {
+		throws ESException, InvalidVersionSpecException {
 
 		AbstractChangePackage cp = changePackage;
 		final SessionId clonedSessionId = checkSessionId(sessionId);
@@ -130,7 +130,7 @@
 
 	public PrimaryVersionSpec resolveVersionSpec(final SessionId sessionId, final ProjectId projectId,
 		final VersionSpec versionSpec)
-			throws ESException {
+		throws ESException {
 
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return ModelUtil.clone(
@@ -158,7 +158,7 @@
 
 	public List<HistoryInfo> getHistoryInfo(final SessionId sessionId, final ProjectId projectId,
 		final HistoryQuery<?> historyQuery)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return ModelUtil.clone(
 			emfStore.getHistoryInfo(
@@ -169,7 +169,7 @@
 
 	public void addTag(final SessionId sessionId, final ProjectId projectId, final PrimaryVersionSpec versionSpec,
 		final TagVersionSpec tag)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		emfStore.addTag(
 			clonedSessionId,
@@ -180,7 +180,7 @@
 
 	public void removeTag(final SessionId sessionId, final ProjectId projectId, final PrimaryVersionSpec versionSpec,
 		final TagVersionSpec tag)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		emfStore.removeTag(
 			clonedSessionId,
@@ -191,7 +191,7 @@
 
 	public ProjectInfo createEmptyProject(final SessionId sessionId, final String name, final String description,
 		final LogMessage logMessage)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		final ProjectInfo projectInfo = emfStore.createEmptyProject(clonedSessionId, name, description,
 			ModelUtil.clone(logMessage));
@@ -251,7 +251,7 @@
 
 	public FileTransferInformation uploadFileChunk(final SessionId sessionId, final ProjectId projectId,
 		final FileChunk fileChunk)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return emfStore.uploadFileChunk(clonedSessionId, ModelUtil.clone(projectId), fileChunk);
 	}
@@ -264,7 +264,7 @@
 
 	public void transmitProperty(final SessionId sessionId, final OrgUnitProperty changedProperty, final ACUser user,
 		final ProjectId projectId)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		emfStore.transmitProperty(
 			clonedSessionId,
@@ -326,7 +326,7 @@
 	 */
 	public String uploadChangePackageFragment(final SessionId sessionId, final ProjectId projectId,
 		final ChangePackageEnvelope envelope)
-			throws ESException {
+		throws ESException {
 
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 
@@ -344,7 +344,7 @@
 	 */
 	public ChangePackageEnvelope downloadChangePackageFragment(final SessionId sessionId, final String proxyId,
 		final int fragmentIndex)
-			throws ESException {
+		throws ESException {
 		final SessionId clonedSessionId = checkSessionId(sessionId);
 		return ModelUtil.clone(
 			emfStore.downloadChangePackageFragment(
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java
index cc0ab58..6bfdcbf 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ProjectUtil.java
@@ -99,8 +99,8 @@
 	}
 
 	public static void deleteRemoteProjects(ESServer server, ESUsersession usersession) throws IOException,
-	FatalESException,
-	ESException {
+		FatalESException,
+		ESException {
 		for (final ESRemoteProject project : server.getRemoteProjects(usersession)) {
 			project.delete(usersession, new NullProgressMonitor());
 		}
@@ -240,7 +240,7 @@
 
 	public static ESLocalProject tag(ESLocalProject localProject, ESPrimaryVersionSpec versionSpec, String branchName,
 		String tag)
-			throws ESException {
+		throws ESException {
 		final ESTagVersionSpec tagVersionSpec = CreateAPI.tagVersionSpec(branchName, tag);
 		localProject.addTag(versionSpec, tagVersionSpec, nullProgressMonitor());
 		return localProject;
diff --git a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
index 686d75f..c6fe9b7 100644
--- a/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
+++ b/tests/org.eclipse.emf.emfstore.test.common/src/org/eclipse/emf/emfstore/client/test/common/util/ServerUtil.java
@@ -384,7 +384,8 @@
 					try {
 						FileUtil.copyFile(new URL("platform:/plugin/" //$NON-NLS-1$
 							+ element.getIConfigurationElement().getNamespaceIdentifier() + "/" + attribute) //$NON-NLS-1$
-							.openConnection().getInputStream(), targetFile);
+								.openConnection().getInputStream(),
+							targetFile);
 						return;
 					} catch (final IOException e) {
 						ModelUtil.logWarning("Copy of file from " + source + " to " + target + " failed", e); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -404,8 +405,7 @@
 	// TODO: duplicate method
 	private static InputStream getResource(String resource) throws IOException {
 
-		final URL configURL =
-			FrameworkUtil.getBundle(ServerUtil.class).getEntry(resource);
+		final URL configURL = FrameworkUtil.getBundle(ServerUtil.class).getEntry(resource);
 		// Activator.getDefault().getBundle().getBundleContext().getBundle()
 		// .getEntry(resource);
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java
index 9f51b96..f6fb434 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/model/provider/TestmodelEditPlugin.java
@@ -18,16 +18,15 @@
  * This is the central singleton for the Testmodel edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public final class TestmodelEditPlugin extends EMFPlugin
-{
+public final class TestmodelEditPlugin extends EMFPlugin {
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	public static final TestmodelEditPlugin INSTANCE = new TestmodelEditPlugin();
@@ -36,7 +35,7 @@
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -45,27 +44,24 @@
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestmodelEditPlugin()
-	{
-		super(new ResourceLocator[]
-		{
-			});
+	public TestmodelEditPlugin() {
+		super(new ResourceLocator[] {
+		});
 	}
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getPluginResourceLocator()
-	{
+	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
 
@@ -73,12 +69,11 @@
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	public static Implementation getPlugin()
-	{
+	public static Implementation getPlugin() {
 		return plugin;
 	}
 
@@ -86,20 +81,18 @@
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public static class Implementation extends EclipsePlugin
-	{
+	public static class Implementation extends EclipsePlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 *
+		 * 
 		 * @generated
 		 */
-		public Implementation()
-		{
+		public Implementation() {
 			super();
 
 			// Remember the static instance.
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java
index fb66192..ed50f88 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToStringMapItemProvider.java
@@ -23,6 +23,7 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -34,26 +35,22 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class StringToStringMapItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public StringToStringMapItemProvider(AdapterFactory adapterFactory)
-	{
+	public StringToStringMapItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -61,14 +58,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addKeyPropertyDescriptor(object);
@@ -81,19 +76,16 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addKeyPropertyDescriptor(Object object)
-	{
+	protected void addKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_StringToStringMap_key_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_StringToStringMap_key_feature", "_UI_StringToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_StringToStringMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_StringToStringMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.STRING_TO_STRING_MAP__KEY,
 				true,
 				false,
@@ -107,19 +99,16 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addValuePropertyDescriptor(Object object)
-	{
+	protected void addValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_StringToStringMap_value_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_StringToStringMap_value_feature", "_UI_StringToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_StringToStringMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_StringToStringMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.STRING_TO_STRING_MAP__VALUE,
 				true,
 				false,
@@ -133,12 +122,11 @@
 	 * This returns StringToStringMap.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringToStringMap")); //$NON-NLS-1$
 	}
 
@@ -146,13 +134,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final Map.Entry<?, ?> stringToStringMap = (Map.Entry<?, ?>) object;
+	public String getText(Object object) {
+		Map.Entry<?, ?> stringToStringMap = (Map.Entry<?, ?>) object;
 		return "" + stringToStringMap.getKey() + " -> " + stringToStringMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -161,16 +148,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Map.Entry.class))
-		{
+		switch (notification.getFeatureID(Map.Entry.class)) {
 		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
 		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
@@ -184,12 +169,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -197,12 +181,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return TestmodelEditPlugin.INSTANCE;
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java
index 40651c8..5d6af8f 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/StringToTestElementMapItemProvider.java
@@ -23,6 +23,7 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -34,26 +35,22 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class StringToTestElementMapItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public StringToTestElementMapItemProvider(AdapterFactory adapterFactory)
-	{
+	public StringToTestElementMapItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -61,14 +58,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addValuePropertyDescriptor(object);
@@ -81,19 +76,16 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addValuePropertyDescriptor(Object object)
-	{
+	protected void addValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_StringToTestElementMap_value_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_value_feature", "_UI_StringToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_StringToTestElementMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP__VALUE,
 				true,
 				false,
@@ -107,19 +99,16 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addKeyPropertyDescriptor(Object object)
-	{
+	protected void addKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_StringToTestElementMap_key_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_key_feature", "_UI_StringToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_StringToTestElementMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_StringToTestElementMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP__KEY,
 				true,
 				false,
@@ -133,12 +122,11 @@
 	 * This returns StringToTestElementMap.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/StringToTestElementMap")); //$NON-NLS-1$
 	}
 
@@ -146,13 +134,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final Map.Entry<?, ?> stringToTestElementMap = (Map.Entry<?, ?>) object;
+	public String getText(Object object) {
+		Map.Entry<?, ?> stringToTestElementMap = (Map.Entry<?, ?>) object;
 		return "" + stringToTestElementMap.getKey() + " -> " + stringToTestElementMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -161,16 +148,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Map.Entry.class))
-		{
+		switch (notification.getFeatureID(Map.Entry.class)) {
 		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -183,12 +168,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -196,12 +180,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return TestmodelEditPlugin.INSTANCE;
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java
index a248d5f..32fad1a 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementItemProvider.java
@@ -21,11 +21,7 @@
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMapUtil;
 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.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
@@ -38,24 +34,19 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.test.model.TestElement} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestElementItemProvider
-	extends ItemProviderAdapter
-	implements
-	IEditingDomainItemProvider, ITreeItemContentProvider, IItemLabelProvider,
-	IItemPropertySource
-{
+	extends ItemProviderAdapter {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestElementItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestElementItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -63,14 +54,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addNamePropertyDescriptor(object);
@@ -92,15 +81,12 @@
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addNamePropertyDescriptor(Object object)
-	{
+	protected void addNamePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_name_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_name_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -117,18 +103,16 @@
 	 * This adds a property descriptor for the Strings feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addStringsPropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addStringsPropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_strings_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_strings_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_strings_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__STRINGS,
 				true,
 				false,
@@ -142,19 +126,16 @@
 	 * This adds a property descriptor for the References feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addReferencesPropertyDescriptor(Object object)
-	{
+	protected void addReferencesPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_references_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_references_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_references_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__REFERENCES,
 				true,
 				false,
@@ -168,18 +149,16 @@
 	 * This adds a property descriptor for the Reference feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addReferencePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addReferencePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_reference_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_reference_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_reference_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__REFERENCE,
 				true,
 				false,
@@ -193,19 +172,16 @@
 	 * This adds a property descriptor for the Other Reference feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addOtherReferencePropertyDescriptor(Object object)
-	{
+	protected void addOtherReferencePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_otherReference_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_otherReference_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_otherReference_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__OTHER_REFERENCE,
 				true,
 				false,
@@ -219,19 +195,16 @@
 	 * This adds a property descriptor for the Description feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addDescriptionPropertyDescriptor(Object object)
-	{
+	protected void addDescriptionPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_description_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_description_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_description_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__DESCRIPTION,
 				true,
 				false,
@@ -245,19 +218,16 @@
 	 * This adds a property descriptor for the Non Contained NTo1 feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addNonContained_NTo1PropertyDescriptor(Object object)
-	{
+	protected void addNonContained_NTo1PropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_nonContained_NTo1_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NTo1_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NTo1_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_NTO1,
 				true,
 				false,
@@ -271,19 +241,16 @@
 	 * This adds a property descriptor for the Non Contained 1To N feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addNonContained_1ToNPropertyDescriptor(Object object)
-	{
+	protected void addNonContained_1ToNPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_nonContained_1ToN_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_1ToN_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_1ToN_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_1TO_N,
 				true,
 				false,
@@ -297,19 +264,16 @@
 	 * This adds a property descriptor for the Non Contained NTo M feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addNonContained_NToMPropertyDescriptor(Object object)
-	{
+	protected void addNonContained_NToMPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_nonContained_NToM_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NToM_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_NToM_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_NTO_M,
 				true,
 				false,
@@ -323,19 +287,16 @@
 	 * This adds a property descriptor for the Non Contained MTo N feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addNonContained_MToNPropertyDescriptor(Object object)
-	{
+	protected void addNonContained_MToNPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_nonContained_MToN_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_MToN_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_nonContained_MToN_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__NON_CONTAINED_MTO_N,
 				true,
 				false,
@@ -349,19 +310,16 @@
 	 * This adds a property descriptor for the Contained Elements No Opposite feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addContainedElements_NoOppositePropertyDescriptor(Object object)
-	{
+	protected void addContainedElements_NoOppositePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElement_containedElements_NoOpposite_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElement_containedElements_NoOpposite_feature", "_UI_TestElement_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElement_containedElements_NoOpposite_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElement_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE,
 				true,
 				false,
@@ -377,14 +335,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS);
 			childrenFeatures.add(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT);
@@ -404,12 +360,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -420,12 +375,11 @@
 	 * This returns TestElement.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestElement")); //$NON-NLS-1$
 	}
 
@@ -433,15 +387,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((TestElement) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TestElement_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((TestElement) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_TestElement_type") : //$NON-NLS-1$
 			getString("_UI_TestElement_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -450,16 +402,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TestElement.class))
-		{
+		switch (notification.getFeatureID(TestElement.class)) {
 		case TestmodelPackage.TEST_ELEMENT__NAME:
 		case TestmodelPackage.TEST_ELEMENT__STRINGS:
 		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
@@ -485,110 +435,80 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS,
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS,
+			TestmodelFactory.eINSTANCE.createTestElement()));
+
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT,
+			TestmodelFactory.eINSTANCE.createTestElement()));
+
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_MAP,
+			TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP)));
+
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_STRING_MAP,
+			TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_STRING_MAP)));
+
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_TO_STRING_MAP,
+			TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP)));
+
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_ELEMENT_MAP,
+			TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP)));
+
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2,
+			TestmodelFactory.eINSTANCE.createTestElement()));
+
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE,
 				TestmodelFactory.eINSTANCE.createTestElement()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT,
-				TestmodelFactory.eINSTANCE.createTestElement()));
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
+			FeatureMapUtil.createEntry(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
+				TestmodelFactory.eINSTANCE.createTestElement())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_MAP,
-				TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP)));
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
+			FeatureMapUtil.createEntry(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
+				TestmodelFactory.eINSTANCE.createTestElement())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_STRING_MAP,
-				TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_STRING_MAP)));
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
+			TestmodelFactory.eINSTANCE.createTestElement()));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__ELEMENT_TO_STRING_MAP,
-				TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP)));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__STRING_TO_ELEMENT_MAP,
-				TestmodelFactory.eINSTANCE.create(TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP)));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2,
-				TestmodelFactory.eINSTANCE.createTestElement()));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE,
-				TestmodelFactory.eINSTANCE.createTestElement()));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
-						TestmodelFactory.eINSTANCE.createTestElement())));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_ENTRIES,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
-						TestmodelFactory.eINSTANCE.createTestElement())));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1,
-				TestmodelFactory.eINSTANCE.createTestElement()));
-
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
-				TestmodelFactory.eINSTANCE.createTestElement()));
+		newChildDescriptors.add(createChildParameter(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2,
+			TestmodelFactory.eINSTANCE.createTestElement()));
 	}
 
 	/**
 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
-	{
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
 
 		if (childFeature instanceof EStructuralFeature
-			&& FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature))
-		{
-			final FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
+			&& FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		final boolean qualify =
-			childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS ||
-				childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT ||
-				childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2 ||
-				childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE ||
-				childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1 ||
-				childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2;
+		boolean qualify = childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS ||
+			childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT ||
+			childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENTS2 ||
+			childFeature == TestmodelPackage.Literals.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE ||
+			childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1 ||
+			childFeature == TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2;
 
-		if (qualify)
-		{
+		if (qualify) {
 			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
 				new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
@@ -599,12 +519,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return TestmodelEditPlugin.INSTANCE;
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java
index bf805fd..bdc2521 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToStringMapItemProvider.java
@@ -23,6 +23,7 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -34,26 +35,22 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestElementToStringMapItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestElementToStringMapItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestElementToStringMapItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -61,14 +58,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addValuePropertyDescriptor(object);
@@ -81,19 +76,16 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addValuePropertyDescriptor(Object object)
-	{
+	protected void addValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElementToStringMap_value_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_value_feature", "_UI_TestElementToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElementToStringMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP__VALUE,
 				true,
 				false,
@@ -107,19 +99,16 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addKeyPropertyDescriptor(Object object)
-	{
+	protected void addKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElementToStringMap_key_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_key_feature", "_UI_TestElementToStringMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElementToStringMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElementToStringMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP__KEY,
 				true,
 				false,
@@ -133,12 +122,11 @@
 	 * This returns TestElementToStringMap.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestElementToStringMap")); //$NON-NLS-1$
 	}
 
@@ -146,13 +134,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final Map.Entry<?, ?> testElementToStringMap = (Map.Entry<?, ?>) object;
+	public String getText(Object object) {
+		Map.Entry<?, ?> testElementToStringMap = (Map.Entry<?, ?>) object;
 		return "" + testElementToStringMap.getKey() + " -> " + testElementToStringMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -161,16 +148,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(Map.Entry.class))
-		{
+		switch (notification.getFeatureID(Map.Entry.class)) {
 		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -183,12 +168,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -196,12 +180,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return TestmodelEditPlugin.INSTANCE;
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java
index 60604b1..86dacd9 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestElementToTestElementMapItemProvider.java
@@ -23,6 +23,7 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
@@ -32,26 +33,22 @@
  * This is the item provider adapter for a {@link java.util.Map.Entry} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestElementToTestElementMapItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestElementToTestElementMapItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestElementToTestElementMapItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -59,14 +56,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addValuePropertyDescriptor(object);
@@ -79,19 +74,16 @@
 	 * This adds a property descriptor for the Value feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addValuePropertyDescriptor(Object object)
-	{
+	protected void addValuePropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElementToTestElementMap_value_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_value_feature", "_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_value_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE,
 				true,
 				false,
@@ -105,19 +97,16 @@
 	 * This adds a property descriptor for the Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addKeyPropertyDescriptor(Object object)
-	{
+	protected void addKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestElementToTestElementMap_key_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_key_feature", "_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TestElementToTestElementMap_key_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TestElementToTestElementMap_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY,
 				true,
 				false,
@@ -131,12 +120,11 @@
 	 * This returns TestElementToTestElementMap.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestElementToTestElementMap")); //$NON-NLS-1$
 	}
 
@@ -144,13 +132,12 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final Map.Entry<?, ?> testElementToTestElementMap = (Map.Entry<?, ?>) object;
+	public String getText(Object object) {
+		Map.Entry<?, ?> testElementToTestElementMap = (Map.Entry<?, ?>) object;
 		return "" + testElementToTestElementMap.getKey() + " -> " + testElementToTestElementMap.getValue(); //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -159,12 +146,11 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 		super.notifyChanged(notification);
 	}
@@ -174,12 +160,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -187,12 +172,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return TestmodelEditPlugin.INSTANCE;
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java
index 9b15a90..b2eaa89 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestTypeItemProvider.java
@@ -22,6 +22,7 @@
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
@@ -34,26 +35,22 @@
  * This is the item provider adapter for a {@link org.eclipse.emf.emfstore.test.model.TestType} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestTypeItemProvider
 	extends ItemProviderAdapter
 	implements
-	IEditingDomainItemProvider,
-	ITreeItemContentProvider,
-	IItemLabelProvider,
-	IItemPropertySource
-{
+	IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
+	IItemPropertySource {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestTypeItemProvider(AdapterFactory adapterFactory)
-	{
+	public TestTypeItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -61,14 +58,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addNamePropertyDescriptor(object);
@@ -80,14 +75,12 @@
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addNamePropertyDescriptor(Object object)
-	{
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+	protected void addNamePropertyDescriptor(Object object) {
+		itemPropertyDescriptors
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TestType_name_feature"), //$NON-NLS-1$
 				getString("_UI_PropertyDescriptor_description", "_UI_TestType_name_feature", "_UI_TestType_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
@@ -104,12 +97,11 @@
 	 * This returns TestType.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TestType")); //$NON-NLS-1$
 	}
 
@@ -117,15 +109,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((TestType) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TestType_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((TestType) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_TestType_type") : //$NON-NLS-1$
 			getString("_UI_TestType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -134,16 +124,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TestType.class))
-		{
+		switch (notification.getFeatureID(TestType.class)) {
 		case TestmodelPackage.TEST_TYPE__NAME:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
 			return;
@@ -156,12 +144,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -169,12 +156,11 @@
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public ResourceLocator getResourceLocator()
-	{
+	public ResourceLocator getResourceLocator() {
 		return TestmodelEditPlugin.INSTANCE;
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java
index 4c230a1..441e892 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TestmodelItemProviderAdapterFactory.java
@@ -38,17 +38,16 @@
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
 public class TestmodelItemProviderAdapterFactory extends TestmodelAdapterFactory implements ComposeableAdapterFactory,
-	IChangeNotifier, IDisposable
-{
+	IChangeNotifier, IDisposable {
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -57,7 +56,7 @@
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -66,7 +65,7 @@
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -75,11 +74,10 @@
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TestmodelItemProviderAdapterFactory()
-	{
+	public TestmodelItemProviderAdapterFactory() {
 		supportedTypes.add(IEditingDomainItemProvider.class);
 		supportedTypes.add(IStructuredItemContentProvider.class);
 		supportedTypes.add(ITreeItemContentProvider.class);
@@ -92,7 +90,7 @@
 	 * instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestElementItemProvider testElementItemProvider;
@@ -101,14 +99,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.test.model.TestElement}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestElementAdapter()
-	{
-		if (testElementItemProvider == null)
-		{
+	public Adapter createTestElementAdapter() {
+		if (testElementItemProvider == null) {
 			testElementItemProvider = new TestElementItemProvider(this);
 		}
 
@@ -119,7 +115,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestElementToStringMapItemProvider testElementToStringMapItemProvider;
@@ -128,14 +124,12 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestElementToStringMapAdapter()
-	{
-		if (testElementToStringMapItemProvider == null)
-		{
+	public Adapter createTestElementToStringMapAdapter() {
+		if (testElementToStringMapItemProvider == null) {
 			testElementToStringMapItemProvider = new TestElementToStringMapItemProvider(this);
 		}
 
@@ -146,7 +140,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected StringToStringMapItemProvider stringToStringMapItemProvider;
@@ -155,14 +149,12 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createStringToStringMapAdapter()
-	{
-		if (stringToStringMapItemProvider == null)
-		{
+	public Adapter createStringToStringMapAdapter() {
+		if (stringToStringMapItemProvider == null) {
 			stringToStringMapItemProvider = new StringToStringMapItemProvider(this);
 		}
 
@@ -173,7 +165,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestElementToTestElementMapItemProvider testElementToTestElementMapItemProvider;
@@ -182,14 +174,12 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestElementToTestElementMapAdapter()
-	{
-		if (testElementToTestElementMapItemProvider == null)
-		{
+	public Adapter createTestElementToTestElementMapAdapter() {
+		if (testElementToTestElementMapItemProvider == null) {
 			testElementToTestElementMapItemProvider = new TestElementToTestElementMapItemProvider(this);
 		}
 
@@ -200,7 +190,7 @@
 	 * This keeps track of the one adapter used for all {@link java.util.Map.Entry} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected StringToTestElementMapItemProvider stringToTestElementMapItemProvider;
@@ -209,14 +199,12 @@
 	 * This creates an adapter for a {@link java.util.Map.Entry}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createStringToTestElementMapAdapter()
-	{
-		if (stringToTestElementMapItemProvider == null)
-		{
+	public Adapter createStringToTestElementMapAdapter() {
+		if (stringToTestElementMapItemProvider == null) {
 			stringToTestElementMapItemProvider = new StringToTestElementMapItemProvider(this);
 		}
 
@@ -227,7 +215,7 @@
 	 * This keeps track of the one adapter used for all {@link org.eclipse.emf.emfstore.test.model.TestType} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TestTypeItemProvider testTypeItemProvider;
@@ -236,14 +224,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.test.model.TestType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTestTypeAdapter()
-	{
-		if (testTypeItemProvider == null)
-		{
+	public Adapter createTestTypeAdapter() {
+		if (testTypeItemProvider == null) {
 			testTypeItemProvider = new TestTypeItemProvider(this);
 		}
 
@@ -255,7 +241,7 @@
 	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TypeWithFeatureMapNonContainmentItemProvider typeWithFeatureMapNonContainmentItemProvider;
@@ -264,14 +250,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTypeWithFeatureMapNonContainmentAdapter()
-	{
-		if (typeWithFeatureMapNonContainmentItemProvider == null)
-		{
+	public Adapter createTypeWithFeatureMapNonContainmentAdapter() {
+		if (typeWithFeatureMapNonContainmentItemProvider == null) {
 			typeWithFeatureMapNonContainmentItemProvider = new TypeWithFeatureMapNonContainmentItemProvider(this);
 		}
 
@@ -283,7 +267,7 @@
 	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	protected TypeWithFeatureMapContainmentItemProvider typeWithFeatureMapContainmentItemProvider;
@@ -292,14 +276,12 @@
 	 * This creates an adapter for a {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter createTypeWithFeatureMapContainmentAdapter()
-	{
-		if (typeWithFeatureMapContainmentItemProvider == null)
-		{
+	public Adapter createTypeWithFeatureMapContainmentAdapter() {
+		if (typeWithFeatureMapContainmentItemProvider == null) {
 			typeWithFeatureMapContainmentItemProvider = new TypeWithFeatureMapContainmentItemProvider(this);
 		}
 
@@ -310,11 +292,10 @@
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public ComposeableAdapterFactory getRootAdapterFactory()
-	{
+	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
 
@@ -322,23 +303,21 @@
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory)
-	{
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public boolean isFactoryForType(Object type)
-	{
+	public boolean isFactoryForType(Object type) {
 		return supportedTypes.contains(type) || super.isFactoryForType(type);
 	}
 
@@ -346,29 +325,25 @@
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Adapter adapt(Notifier notifier, Object type)
-	{
+	public Adapter adapt(Notifier notifier, Object type) {
 		return super.adapt(notifier, this);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object adapt(Object object, Object type)
-	{
-		if (isFactoryForType(type))
-		{
-			final Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || ((Class<?>) type).isInstance(adapter))
-			{
+	public Object adapt(Object object, Object type) {
+		if (isFactoryForType(type)) {
+			Object adapter = super.adapt(object, type);
+			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
@@ -380,11 +355,10 @@
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void addListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
 
@@ -392,11 +366,10 @@
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener)
-	{
+	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
 
@@ -404,15 +377,13 @@
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void fireNotifyChanged(Notification notification)
-	{
+	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
-		if (parentAdapterFactory != null)
-		{
+		if (parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -421,35 +392,26 @@
 	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public void dispose()
-	{
-		if (testElementItemProvider != null) {
+	public void dispose() {
+		if (testElementItemProvider != null)
 			testElementItemProvider.dispose();
-		}
-		if (testElementToStringMapItemProvider != null) {
+		if (testElementToStringMapItemProvider != null)
 			testElementToStringMapItemProvider.dispose();
-		}
-		if (stringToStringMapItemProvider != null) {
+		if (stringToStringMapItemProvider != null)
 			stringToStringMapItemProvider.dispose();
-		}
-		if (testElementToTestElementMapItemProvider != null) {
+		if (testElementToTestElementMapItemProvider != null)
 			testElementToTestElementMapItemProvider.dispose();
-		}
-		if (stringToTestElementMapItemProvider != null) {
+		if (stringToTestElementMapItemProvider != null)
 			stringToTestElementMapItemProvider.dispose();
-		}
-		if (testTypeItemProvider != null) {
+		if (testTypeItemProvider != null)
 			testTypeItemProvider.dispose();
-		}
-		if (typeWithFeatureMapNonContainmentItemProvider != null) {
+		if (typeWithFeatureMapNonContainmentItemProvider != null)
 			typeWithFeatureMapNonContainmentItemProvider.dispose();
-		}
-		if (typeWithFeatureMapContainmentItemProvider != null) {
+		if (typeWithFeatureMapContainmentItemProvider != null)
 			typeWithFeatureMapContainmentItemProvider.dispose();
-		}
 	}
 
 }
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java
index 2eb77b7..0fba590 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapContainmentItemProvider.java
@@ -27,20 +27,18 @@
  * object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class TypeWithFeatureMapContainmentItemProvider extends TestTypeItemProvider
-{
+public class TypeWithFeatureMapContainmentItemProvider extends TestTypeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TypeWithFeatureMapContainmentItemProvider(AdapterFactory adapterFactory)
-	{
+	public TypeWithFeatureMapContainmentItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -48,14 +46,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 		}
@@ -68,14 +64,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
 		}
@@ -85,12 +79,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -101,12 +94,11 @@
 	 * This returns TypeWithFeatureMapContainment.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TypeWithFeatureMapContainment")); //$NON-NLS-1$
 	}
 
@@ -114,15 +106,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((TypeWithFeatureMapContainment) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TypeWithFeatureMapContainment_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((TypeWithFeatureMapContainment) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_TypeWithFeatureMapContainment_type") : //$NON-NLS-1$
 			getString("_UI_TypeWithFeatureMapContainment_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -131,16 +121,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TypeWithFeatureMapContainment.class))
-		{
+		switch (notification.getFeatureID(TypeWithFeatureMapContainment.class)) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -153,12 +141,11 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java
index a739b74..5866605 100644
--- a/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java
+++ b/tests/org.eclipse.emf.emfstore.test.model.edit/src/org/eclipse/emf/emfstore/test/provider/TypeWithFeatureMapNonContainmentItemProvider.java
@@ -31,20 +31,18 @@
  * object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
- *
+ * 
  * @generated
  */
-public class TypeWithFeatureMapNonContainmentItemProvider extends TestTypeItemProvider
-{
+public class TypeWithFeatureMapNonContainmentItemProvider extends TestTypeItemProvider {
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	public TypeWithFeatureMapNonContainmentItemProvider(AdapterFactory adapterFactory)
-	{
+	public TypeWithFeatureMapNonContainmentItemProvider(AdapterFactory adapterFactory) {
 		super(adapterFactory);
 	}
 
@@ -52,14 +50,12 @@
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object)
-	{
-		if (itemPropertyDescriptors == null)
-		{
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+		if (itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
 
 			addFirstKeyPropertyDescriptor(object);
@@ -72,19 +68,16 @@
 	 * This adds a property descriptor for the First Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addFirstKeyPropertyDescriptor(Object object)
-	{
+	protected void addFirstKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TypeWithFeatureMapNonContainment_firstKey_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TypeWithFeatureMapNonContainment_firstKey_feature", "_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", "_UI_TypeWithFeatureMapNonContainment_firstKey_feature", //$NON-NLS-1$//$NON-NLS-2$
+					"_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
 				true,
 				false,
@@ -98,19 +91,17 @@
 	 * This adds a property descriptor for the Second Key feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
-	protected void addSecondKeyPropertyDescriptor(Object object)
-	{
+	protected void addSecondKeyPropertyDescriptor(Object object) {
 		itemPropertyDescriptors
-			.add
-			(createItemPropertyDescriptor
-			(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
+			.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(),
 				getResourceLocator(),
 				getString("_UI_TypeWithFeatureMapNonContainment_secondKey_feature"), //$NON-NLS-1$
-				getString(
-					"_UI_PropertyDescriptor_description", "_UI_TypeWithFeatureMapNonContainment_secondKey_feature", "_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+				getString("_UI_PropertyDescriptor_description", //$NON-NLS-1$
+					"_UI_TypeWithFeatureMapNonContainment_secondKey_feature", //$NON-NLS-1$
+					"_UI_TypeWithFeatureMapNonContainment_type"), //$NON-NLS-1$
 				TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
 				true,
 				false,
@@ -126,14 +117,12 @@
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object)
-	{
-		if (childrenFeatures == null)
-		{
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if (childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
 		}
@@ -143,12 +132,11 @@
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child)
-	{
+	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
 
@@ -159,12 +147,11 @@
 	 * This returns TypeWithFeatureMapNonContainment.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Object getImage(Object object)
-	{
+	public Object getImage(Object object) {
 		return overlayImage(object, getResourceLocator().getImage("full/obj16/TypeWithFeatureMapNonContainment")); //$NON-NLS-1$
 	}
 
@@ -172,15 +159,13 @@
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getText(Object object)
-	{
-		final String label = ((TypeWithFeatureMapNonContainment) object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_TypeWithFeatureMapNonContainment_type") : //$NON-NLS-1$
+	public String getText(Object object) {
+		String label = ((TypeWithFeatureMapNonContainment) object).getName();
+		return label == null || label.length() == 0 ? getString("_UI_TypeWithFeatureMapNonContainment_type") : //$NON-NLS-1$
 			getString("_UI_TypeWithFeatureMapNonContainment_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$
 	}
 
@@ -189,16 +174,14 @@
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public void notifyChanged(Notification notification)
-	{
+	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
 
-		switch (notification.getFeatureID(TypeWithFeatureMapNonContainment.class))
-		{
+		switch (notification.getFeatureID(TypeWithFeatureMapNonContainment.class)) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
 			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
 			return;
@@ -211,84 +194,67 @@
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object)
-	{
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
-						TestmodelFactory.eINSTANCE.createTestType())));
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+				FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
+					TestmodelFactory.eINSTANCE.createTestType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
-						TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+				FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
+					TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
-						TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+				FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY,
+					TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
-						TestmodelFactory.eINSTANCE.createTestType())));
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+				FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
+					TestmodelFactory.eINSTANCE.createTestType())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
-						TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+				FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
+					TestmodelFactory.eINSTANCE.createTypeWithFeatureMapNonContainment())));
 
-		newChildDescriptors.add
-			(createChildParameter
-			(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
-				FeatureMapUtil.createEntry
-					(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
-						TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
+		newChildDescriptors
+			.add(createChildParameter(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP,
+				FeatureMapUtil.createEntry(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY,
+					TestmodelFactory.eINSTANCE.createTypeWithFeatureMapContainment())));
 	}
 
 	/**
 	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 *
+	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection)
-	{
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
 
 		if (childFeature instanceof EStructuralFeature
-			&& FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature))
-		{
-			final FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
+			&& FeatureMapUtil.isFeatureMap((EStructuralFeature) childFeature)) {
+			FeatureMap.Entry entry = (FeatureMap.Entry) childObject;
 			childFeature = entry.getEStructuralFeature();
 			childObject = entry.getValue();
 		}
 
-		final boolean qualify =
-			childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY ||
-				childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY;
+		boolean qualify = childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY ||
+			childFeature == TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY;
 
-		if (qualify)
-		{
+		if (qualify) {
 			return getString("_UI_CreateChild_text2", //$NON-NLS-1$
 				new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java
index aac9805..5b0b439 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestElement.java
@@ -1,648 +1,648 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model;

-

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.util.FeatureMap;

-

-/**

- * <!-- begin-user-doc -->

- * A representation of the model object '<em><b>Test Element</b></em>'.

- * <!-- end-user-doc -->

- *

- * <p>

- * The following features are supported:

- * <ul>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings <em>Strings</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap <em>Element Map</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap <em>String To String Map</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap <em>Element To String Map</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap <em>String To Element Map</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite <em>Contained Elements No

- * Opposite</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite <em>Contained Element No

- * Opposite</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}

- * </li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}

- * </li>

- * </ul>

- * </p>

- *

- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement()

- * @model

- * @generated

- */

-public interface TestElement extends EObject {

-	/**

-	 * Returns the value of the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Name</em>' attribute.

-	 * @see #setName(String)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Name()

-	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel foo='bar'"

-	 * @generated

-	 */

-	String getName();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Name</em>' attribute.

-	 * @see #getName()

-	 * @generated

-	 */

-	void setName(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Strings</b></em>' attribute list.

-	 * The list contents are of type {@link java.lang.String}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Strings</em>' attribute list isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Strings</em>' attribute list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Strings()

-	 * @model

-	 * @generated

-	 */

-	EList<String> getStrings();

-

-	/**

-	 * Returns the value of the '<em><b>References</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>References</em>' reference list isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>References</em>' reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_References()

-	 * @model

-	 * @generated

-	 */

-	EList<TestElement> getReferences();

-

-	/**

-	 * Returns the value of the '<em><b>Contained Elements</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer

-	 * <em>Container</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Contained Elements</em>' containment reference list isn't clear, there really should

-	 * be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Contained Elements</em>' containment reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer

-	 * @model opposite="container" containment="true"

-	 * @generated

-	 */

-	EList<TestElement> getContainedElements();

-

-	/**

-	 * Returns the value of the '<em><b>Reference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Reference</em>' reference isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Reference</em>' reference.

-	 * @see #setReference(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Reference()

-	 * @model

-	 * @generated

-	 */

-	TestElement getReference();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}'

-	 * reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Reference</em>' reference.

-	 * @see #getReference()

-	 * @generated

-	 */

-	void setReference(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Contained Element</b></em>' containment reference.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer

-	 * <em>Sref Container</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Contained Element</em>' containment reference isn't clear, there really should be more

-	 * of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Contained Element</em>' containment reference.

-	 * @see #setContainedElement(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer

-	 * @model opposite="srefContainer" containment="true"

-	 * @generated

-	 */

-	TestElement getContainedElement();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement

-	 * <em>Contained Element</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Contained Element</em>' containment reference.

-	 * @see #getContainedElement()

-	 * @generated

-	 */

-	void setContainedElement(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Other Reference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Other Reference</em>' reference isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Other Reference</em>' reference.

-	 * @see #setOtherReference(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_OtherReference()

-	 * @model

-	 * @generated

-	 */

-	TestElement getOtherReference();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference

-	 * <em>Other Reference</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Other Reference</em>' reference.

-	 * @see #getOtherReference()

-	 * @generated

-	 */

-	void setOtherReference(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Description</em>' attribute.

-	 * @see #setDescription(String)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Description()

-	 * @model

-	 * @generated

-	 */

-	String getDescription();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription

-	 * <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Description</em>' attribute.

-	 * @see #getDescription()

-	 * @generated

-	 */

-	void setDescription(String value);

-

-	/**

-	 * Returns the value of the '<em><b>Container</b></em>' container reference.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Container</em>' container reference isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Container</em>' container reference.

-	 * @see #setContainer(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements

-	 * @model opposite="containedElements" transient="false"

-	 * @generated

-	 */

-	TestElement getContainer();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'

-	 * container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Container</em>' container reference.

-	 * @see #getContainer()

-	 * @generated

-	 */

-	void setContainer(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Sref Container</b></em>' container reference.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Sref Container</em>' container reference isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Sref Container</em>' container reference.

-	 * @see #setSrefContainer(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_SrefContainer()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement

-	 * @model opposite="containedElement" transient="false"

-	 * @generated

-	 */

-	TestElement getSrefContainer();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer

-	 * <em>Sref Container</em>}' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Sref Container</em>' container reference.

-	 * @see #getSrefContainer()

-	 * @generated

-	 */

-	void setSrefContainer(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Element Map</b></em>' map.

-	 * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},

-	 * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element Map</em>' map isn't clear, there really should be more of a description

-	 * here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Element Map</em>' map.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementMap()

-	 * @model mapType=

-	 *        "org.eclipse.emf.emfstore.test.model.TestElementToTestElementMap<org.eclipse.emf.emfstore.test.model.TestElement, org.eclipse.emf.emfstore.test.model.TestElement>"

-	 * @generated

-	 */

-	EMap<TestElement, TestElement> getElementMap();

-

-	/**

-	 * Returns the value of the '<em><b>String To String Map</b></em>' map.

-	 * The key is of type {@link java.lang.String},

-	 * and the value is of type {@link java.lang.String},

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>String To String Map</em>' map isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>String To String Map</em>' map.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToStringMap()

-	 * @model mapType=

-	 *        "org.eclipse.emf.emfstore.test.model.StringToStringMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"

-	 * @generated

-	 */

-	EMap<String, String> getStringToStringMap();

-

-	/**

-	 * Returns the value of the '<em><b>Element To String Map</b></em>' map.

-	 * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},

-	 * and the value is of type {@link java.lang.String},

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Element To String Map</em>' map isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Element To String Map</em>' map.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementToStringMap()

-	 * @model mapType=

-	 *        "org.eclipse.emf.emfstore.test.model.TestElementToStringMap<org.eclipse.emf.emfstore.test.model.TestElement, org.eclipse.emf.ecore.EString>"

-	 * @generated

-	 */

-	EMap<TestElement, String> getElementToStringMap();

-

-	/**

-	 * Returns the value of the '<em><b>String To Element Map</b></em>' map.

-	 * The key is of type {@link java.lang.String},

-	 * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>String To Element Map</em>' map isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>String To Element Map</em>' map.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToElementMap()

-	 * @model mapType=

-	 *        "org.eclipse.emf.emfstore.test.model.StringToTestElementMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.emfstore.test.model.TestElement>"

-	 * @generated

-	 */

-	EMap<String, TestElement> getStringToElementMap();

-

-	/**

-	 * Returns the value of the '<em><b>Non Contained NTo1</b></em>' reference.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Non Contained NTo1</em>' reference isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Non Contained NTo1</em>' reference.

-	 * @see #setNonContained_NTo1(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NTo1()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN

-	 * @model opposite="nonContained_1ToN"

-	 * @generated

-	 */

-	TestElement getNonContained_NTo1();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1

-	 * <em>Non Contained NTo1</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Non Contained NTo1</em>' reference.

-	 * @see #getNonContained_NTo1()

-	 * @generated

-	 */

-	void setNonContained_NTo1(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Non Contained 1To N</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Non Contained 1To N</em>' reference list isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Non Contained 1To N</em>' reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_1ToN()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1

-	 * @model opposite="nonContained_NTo1"

-	 * @generated

-	 */

-	EList<TestElement> getNonContained_1ToN();

-

-	/**

-	 * Returns the value of the '<em><b>Non Contained NTo M</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Non Contained NTo M</em>' reference list isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Non Contained NTo M</em>' reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NToM()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN

-	 * @model opposite="nonContained_MToN"

-	 * @generated

-	 */

-	EList<TestElement> getNonContained_NToM();

-

-	/**

-	 * Returns the value of the '<em><b>Non Contained MTo N</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Non Contained MTo N</em>' reference list isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Non Contained MTo N</em>' reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_MToN()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM

-	 * @model opposite="nonContained_NToM"

-	 * @generated

-	 */

-	EList<TestElement> getNonContained_MToN();

-

-	/**

-	 * Returns the value of the '<em><b>Contained Elements2</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2

-	 * <em>Container2</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Contained Elements2</em>' containment reference list isn't clear, there really should

-	 * be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Contained Elements2</em>' containment reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements2()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2

-	 * @model opposite="container2" containment="true"

-	 * @generated

-	 */

-	EList<TestElement> getContainedElements2();

-

-	/**

-	 * Returns the value of the '<em><b>Container2</b></em>' container reference.

-	 * It is bidirectional and its opposite is '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Container2</em>' container reference isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Container2</em>' container reference.

-	 * @see #setContainer2(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container2()

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2

-	 * @model opposite="containedElements2" transient="false"

-	 * @generated

-	 */

-	TestElement getContainer2();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'

-	 * container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Container2</em>' container reference.

-	 * @see #getContainer2()

-	 * @generated

-	 */

-	void setContainer2(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Contained Elements No Opposite</em>' reference list isn't clear, there really should

-	 * be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Contained Elements No Opposite</em>' containment reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements_NoOpposite()

-	 * @model containment="true"

-	 * @generated

-	 */

-	EList<TestElement> getContainedElements_NoOpposite();

-

-	/**

-	 * Returns the value of the '<em><b>Contained Element No Opposite</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Contained Element No Opposite</em>' containment reference isn't clear, there really

-	 * should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Contained Element No Opposite</em>' containment reference.

-	 * @see #setContainedElement_NoOpposite(TestElement)

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement_NoOpposite()

-	 * @model containment="true"

-	 * @generated

-	 */

-	TestElement getContainedElement_NoOpposite();

-

-	/**

-	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite

-	 * <em>Contained Element No Opposite</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param value the new value of the '<em>Contained Element No Opposite</em>' containment reference.

-	 * @see #getContainedElement_NoOpposite()

-	 * @generated

-	 */

-	void setContainedElement_NoOpposite(TestElement value);

-

-	/**

-	 * Returns the value of the '<em><b>Feature Map Entries</b></em>' attribute list.

-	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Feature Map Entries</em>' attribute list isn't clear, there really should be more of a

-	 * description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Feature Map Entries</em>' attribute list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapEntries()

-	 * @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"

-	 *        extendedMetaData="kind='group'"

-	 * @generated

-	 */

-	FeatureMap getFeatureMapEntries();

-

-	/**

-	 * Returns the value of the '<em><b>Feature Map References1</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Feature Map References1</em>' containment reference list isn't clear, there really

-	 * should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Feature Map References1</em>' containment reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences1()

-	 * @model containment="true" transient="true" volatile="true" derived="true"

-	 *        extendedMetaData="group='#featureMapEntries'"

-	 * @generated

-	 */

-	EList<TestElement> getFeatureMapReferences1();

-

-	/**

-	 * Returns the value of the '<em><b>Feature Map References2</b></em>' containment reference list.

-	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.

-	 * <!-- begin-user-doc -->

-	 * <p>

-	 * If the meaning of the '<em>Feature Map References2</em>' containment reference list isn't clear, there really

-	 * should be more of a description here...

-	 * </p>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the value of the '<em>Feature Map References2</em>' containment reference list.

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences2()

-	 * @model containment="true" transient="true" volatile="true" derived="true"

-	 *        extendedMetaData="group='#featureMapEntries'"

-	 * @generated

-	 */

-	EList<TestElement> getFeatureMapReferences2();

-

-} // TestElement

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.util.FeatureMap;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Test Element</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings <em>Strings</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap <em>Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap <em>String To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap <em>Element To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap <em>String To Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite
+ * <em>Contained Elements No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
+ * <em>Contained Element No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}
+ * </li>
+ * </ul>
+ *
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement()
+ * @model
+ * @generated
+ */
+public interface TestElement extends EObject {
+	/**
+	 * Returns the value of the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there really should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Name</em>' attribute.
+	 * @see #setName(String)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Name()
+	 * @model annotation="http://www.eclipse.org/emf/2002/GenModel foo='bar'"
+	 * @generated
+	 */
+	String getName();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * @see #getName()
+	 * @generated
+	 */
+	void setName(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Strings</b></em>' attribute list.
+	 * The list contents are of type {@link java.lang.String}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Strings</em>' attribute list isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Strings</em>' attribute list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Strings()
+	 * @model
+	 * @generated
+	 */
+	EList<String> getStrings();
+
+	/**
+	 * Returns the value of the '<em><b>References</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>References</em>' reference list isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>References</em>' reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_References()
+	 * @model
+	 * @generated
+	 */
+	EList<TestElement> getReferences();
+
+	/**
+	 * Returns the value of the '<em><b>Contained Elements</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer
+	 * <em>Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contained Elements</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Contained Elements</em>' containment reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer
+	 * @model opposite="container" containment="true"
+	 * @generated
+	 */
+	EList<TestElement> getContainedElements();
+
+	/**
+	 * Returns the value of the '<em><b>Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Reference</em>' reference isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Reference</em>' reference.
+	 * @see #setReference(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Reference()
+	 * @model
+	 * @generated
+	 */
+	TestElement getReference();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference <em>Reference</em>}'
+	 * reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Reference</em>' reference.
+	 * @see #getReference()
+	 * @generated
+	 */
+	void setReference(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Contained Element</b></em>' containment reference.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
+	 * <em>Sref Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contained Element</em>' containment reference isn't clear, there really should be more
+	 * of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Contained Element</em>' containment reference.
+	 * @see #setContainedElement(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
+	 * @model opposite="srefContainer" containment="true"
+	 * @generated
+	 */
+	TestElement getContainedElement();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement
+	 * <em>Contained Element</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Contained Element</em>' containment reference.
+	 * @see #getContainedElement()
+	 * @generated
+	 */
+	void setContainedElement(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Other Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Other Reference</em>' reference isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Other Reference</em>' reference.
+	 * @see #setOtherReference(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_OtherReference()
+	 * @model
+	 * @generated
+	 */
+	TestElement getOtherReference();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference
+	 * <em>Other Reference</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Other Reference</em>' reference.
+	 * @see #getOtherReference()
+	 * @generated
+	 */
+	void setOtherReference(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Description</em>' attribute isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Description</em>' attribute.
+	 * @see #setDescription(String)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Description()
+	 * @model
+	 * @generated
+	 */
+	String getDescription();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription <em>Description</em>
+	 * }' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Description</em>' attribute.
+	 * @see #getDescription()
+	 * @generated
+	 */
+	void setDescription(String value);
+
+	/**
+	 * Returns the value of the '<em><b>Container</b></em>' container reference.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Container</em>' container reference isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Container</em>' container reference.
+	 * @see #setContainer(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements
+	 * @model opposite="containedElements" transient="false"
+	 * @generated
+	 */
+	TestElement getContainer();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'
+	 * container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Container</em>' container reference.
+	 * @see #getContainer()
+	 * @generated
+	 */
+	void setContainer(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Sref Container</b></em>' container reference.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Sref Container</em>' container reference isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Sref Container</em>' container reference.
+	 * @see #setSrefContainer(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_SrefContainer()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement
+	 * @model opposite="containedElement" transient="false"
+	 * @generated
+	 */
+	TestElement getSrefContainer();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer
+	 * <em>Sref Container</em>}' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Sref Container</em>' container reference.
+	 * @see #getSrefContainer()
+	 * @generated
+	 */
+	void setSrefContainer(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Element Map</b></em>' map.
+	 * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+	 * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element Map</em>' map isn't clear, there really should be more of a description
+	 * here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Element Map</em>' map.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementMap()
+	 * @model mapType=
+	 *        "org.eclipse.emf.emfstore.test.model.TestElementToTestElementMap<org.eclipse.emf.emfstore.test.model.TestElement, org.eclipse.emf.emfstore.test.model.TestElement>"
+	 * @generated
+	 */
+	EMap<TestElement, TestElement> getElementMap();
+
+	/**
+	 * Returns the value of the '<em><b>String To String Map</b></em>' map.
+	 * The key is of type {@link java.lang.String},
+	 * and the value is of type {@link java.lang.String},
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>String To String Map</em>' map isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>String To String Map</em>' map.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToStringMap()
+	 * @model mapType=
+	 *        "org.eclipse.emf.emfstore.test.model.StringToStringMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>"
+	 * @generated
+	 */
+	EMap<String, String> getStringToStringMap();
+
+	/**
+	 * Returns the value of the '<em><b>Element To String Map</b></em>' map.
+	 * The key is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+	 * and the value is of type {@link java.lang.String},
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Element To String Map</em>' map isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Element To String Map</em>' map.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ElementToStringMap()
+	 * @model mapType=
+	 *        "org.eclipse.emf.emfstore.test.model.TestElementToStringMap<org.eclipse.emf.emfstore.test.model.TestElement, org.eclipse.emf.ecore.EString>"
+	 * @generated
+	 */
+	EMap<TestElement, String> getElementToStringMap();
+
+	/**
+	 * Returns the value of the '<em><b>String To Element Map</b></em>' map.
+	 * The key is of type {@link java.lang.String},
+	 * and the value is of type {@link org.eclipse.emf.emfstore.test.model.TestElement},
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>String To Element Map</em>' map isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>String To Element Map</em>' map.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_StringToElementMap()
+	 * @model mapType=
+	 *        "org.eclipse.emf.emfstore.test.model.StringToTestElementMap<org.eclipse.emf.ecore.EString, org.eclipse.emf.emfstore.test.model.TestElement>"
+	 * @generated
+	 */
+	EMap<String, TestElement> getStringToElementMap();
+
+	/**
+	 * Returns the value of the '<em><b>Non Contained NTo1</b></em>' reference.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Non Contained NTo1</em>' reference isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Non Contained NTo1</em>' reference.
+	 * @see #setNonContained_NTo1(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NTo1()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN
+	 * @model opposite="nonContained_1ToN"
+	 * @generated
+	 */
+	TestElement getNonContained_NTo1();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1
+	 * <em>Non Contained NTo1</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Non Contained NTo1</em>' reference.
+	 * @see #getNonContained_NTo1()
+	 * @generated
+	 */
+	void setNonContained_NTo1(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Non Contained 1To N</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Non Contained 1To N</em>' reference list isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Non Contained 1To N</em>' reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_1ToN()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1
+	 * @model opposite="nonContained_NTo1"
+	 * @generated
+	 */
+	EList<TestElement> getNonContained_1ToN();
+
+	/**
+	 * Returns the value of the '<em><b>Non Contained NTo M</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Non Contained NTo M</em>' reference list isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Non Contained NTo M</em>' reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_NToM()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN
+	 * @model opposite="nonContained_MToN"
+	 * @generated
+	 */
+	EList<TestElement> getNonContained_NToM();
+
+	/**
+	 * Returns the value of the '<em><b>Non Contained MTo N</b></em>' reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Non Contained MTo N</em>' reference list isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Non Contained MTo N</em>' reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_NonContained_MToN()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM
+	 * @model opposite="nonContained_NToM"
+	 * @generated
+	 */
+	EList<TestElement> getNonContained_MToN();
+
+	/**
+	 * Returns the value of the '<em><b>Contained Elements2</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2
+	 * <em>Container2</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contained Elements2</em>' containment reference list isn't clear, there really should
+	 * be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Contained Elements2</em>' containment reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements2()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2
+	 * @model opposite="container2" containment="true"
+	 * @generated
+	 */
+	EList<TestElement> getContainedElements2();
+
+	/**
+	 * Returns the value of the '<em><b>Container2</b></em>' container reference.
+	 * It is bidirectional and its opposite is '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Container2</em>' container reference isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Container2</em>' container reference.
+	 * @see #setContainer2(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_Container2()
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2
+	 * @model opposite="containedElements2" transient="false"
+	 * @generated
+	 */
+	TestElement getContainer2();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'
+	 * container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Container2</em>' container reference.
+	 * @see #getContainer2()
+	 * @generated
+	 */
+	void setContainer2(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contained Elements No Opposite</em>' reference list isn't clear, there really should
+	 * be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Contained Elements No Opposite</em>' containment reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElements_NoOpposite()
+	 * @model containment="true"
+	 * @generated
+	 */
+	EList<TestElement> getContainedElements_NoOpposite();
+
+	/**
+	 * Returns the value of the '<em><b>Contained Element No Opposite</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Contained Element No Opposite</em>' containment reference isn't clear, there really
+	 * should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Contained Element No Opposite</em>' containment reference.
+	 * @see #setContainedElement_NoOpposite(TestElement)
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_ContainedElement_NoOpposite()
+	 * @model containment="true"
+	 * @generated
+	 */
+	TestElement getContainedElement_NoOpposite();
+
+	/**
+	 * Sets the value of the '{@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
+	 * <em>Contained Element No Opposite</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param value the new value of the '<em>Contained Element No Opposite</em>' containment reference.
+	 * @see #getContainedElement_NoOpposite()
+	 * @generated
+	 */
+	void setContainedElement_NoOpposite(TestElement value);
+
+	/**
+	 * Returns the value of the '<em><b>Feature Map Entries</b></em>' attribute list.
+	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feature Map Entries</em>' attribute list isn't clear, there really should be more of a
+	 * description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Feature Map Entries</em>' attribute list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapEntries()
+	 * @model dataType="org.eclipse.emf.ecore.EFeatureMapEntry" many="true"
+	 *        extendedMetaData="kind='group'"
+	 * @generated
+	 */
+	FeatureMap getFeatureMapEntries();
+
+	/**
+	 * Returns the value of the '<em><b>Feature Map References1</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feature Map References1</em>' containment reference list isn't clear, there really
+	 * should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Feature Map References1</em>' containment reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences1()
+	 * @model containment="true" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="group='#featureMapEntries'"
+	 * @generated
+	 */
+	EList<TestElement> getFeatureMapReferences1();
+
+	/**
+	 * Returns the value of the '<em><b>Feature Map References2</b></em>' containment reference list.
+	 * The list contents are of type {@link org.eclipse.emf.emfstore.test.model.TestElement}.
+	 * <!-- begin-user-doc -->
+	 * <p>
+	 * If the meaning of the '<em>Feature Map References2</em>' containment reference list isn't clear, there really
+	 * should be more of a description here...
+	 * </p>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the value of the '<em>Feature Map References2</em>' containment reference list.
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestElement_FeatureMapReferences2()
+	 * @model containment="true" transient="true" volatile="true" derived="true"
+	 *        extendedMetaData="group='#featureMapEntries'"
+	 * @generated
+	 */
+	EList<TestElement> getFeatureMapReferences2();
+
+} // TestElement
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java
index cb26559..a6f5225 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestType.java
@@ -20,17 +20,16 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.test.model.TestType#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTestType()
  * @model
  * @generated
  */
-public interface TestType extends EObject
-{
+public interface TestType extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java
index 3c87d43..7a2d825 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelFactory.java
@@ -1,85 +1,85 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model;

-

-import org.eclipse.emf.ecore.EFactory;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Factory</b> for the model.

- * It provides a create method for each non-abstract class of the model.

- * <!-- end-user-doc -->

- * 

- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage

- * @generated

- */

-public interface TestmodelFactory extends EFactory {

-	/**

-	 * The singleton instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	TestmodelFactory eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelFactoryImpl.init();

-

-	/**

-	 * Returns a new object of class '<em>Test Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Test Element</em>'.

-	 * @generated

-	 */

-	TestElement createTestElement();

-

-	/**

-	 * Returns a new object of class '<em>Test Type</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Test Type</em>'.

-	 * @generated

-	 */

-	TestType createTestType();

-

-	/**

-	 * Returns a new object of class '<em>Type With Feature Map Non Containment</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Type With Feature Map Non Containment</em>'.

-	 * @generated

-	 */

-	TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment();

-

-	/**

-	 * Returns a new object of class '<em>Type With Feature Map Containment</em>'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return a new object of class '<em>Type With Feature Map Containment</em>'.

-	 * @generated

-	 */

-	TypeWithFeatureMapContainment createTypeWithFeatureMapContainment();

-

-	/**

-	 * Returns the package supported by this factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the package supported by this factory.

-	 * @generated

-	 */

-	TestmodelPackage getTestmodelPackage();

-

-} // TestmodelFactory

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model;
+
+import org.eclipse.emf.ecore.EFactory;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Factory</b> for the model.
+ * It provides a create method for each non-abstract class of the model.
+ * <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
+ * @generated
+ */
+public interface TestmodelFactory extends EFactory {
+	/**
+	 * The singleton instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	TestmodelFactory eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelFactoryImpl.init();
+
+	/**
+	 * Returns a new object of class '<em>Test Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return a new object of class '<em>Test Element</em>'.
+	 * @generated
+	 */
+	TestElement createTestElement();
+
+	/**
+	 * Returns a new object of class '<em>Test Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return a new object of class '<em>Test Type</em>'.
+	 * @generated
+	 */
+	TestType createTestType();
+
+	/**
+	 * Returns a new object of class '<em>Type With Feature Map Non Containment</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return a new object of class '<em>Type With Feature Map Non Containment</em>'.
+	 * @generated
+	 */
+	TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment();
+
+	/**
+	 * Returns a new object of class '<em>Type With Feature Map Containment</em>'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return a new object of class '<em>Type With Feature Map Containment</em>'.
+	 * @generated
+	 */
+	TypeWithFeatureMapContainment createTypeWithFeatureMapContainment();
+
+	/**
+	 * Returns the package supported by this factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the package supported by this factory.
+	 * @generated
+	 */
+	TestmodelPackage getTestmodelPackage();
+
+} // TestmodelFactory
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java
index b73200c..7df3334 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TestmodelPackage.java
@@ -1,1783 +1,1783 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.EcorePackage;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Package</b> for the model.

- * It contains accessors for the meta objects to represent

- * <ul>

- * <li>each class,</li>

- * <li>each feature of each class,</li>

- * <li>each enum,</li>

- * <li>and each data type</li>

- * </ul>

- * <!-- end-user-doc -->

- * 

- * @see org.eclipse.emf.emfstore.test.model.TestmodelFactory

- * @model kind="package"

- * @generated

- */

-public interface TestmodelPackage extends EPackage {

-	/**

-	 * The package name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	String eNAME = "test"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace URI.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	String eNS_URI = "http://eclipse.org/emf/emfstore/test/model"; //$NON-NLS-1$

-

-	/**

-	 * The package namespace name.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	String eNS_PREFIX = "org.eclipse.emf.emfstore.test.model"; //$NON-NLS-1$

-

-	/**

-	 * The singleton instance of the package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	TestmodelPackage eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl.init();

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl

-	 * <em>Test Element</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()

-	 * @generated

-	 */

-	int TEST_ELEMENT = 0;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__NAME = EcorePackage.EOBJECT_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>Strings</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__STRINGS = EcorePackage.EOBJECT_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>References</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__REFERENCES = EcorePackage.EOBJECT_FEATURE_COUNT + 2;

-

-	/**

-	 * The feature id for the '<em><b>Contained Elements</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINED_ELEMENTS = EcorePackage.EOBJECT_FEATURE_COUNT + 3;

-

-	/**

-	 * The feature id for the '<em><b>Reference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 4;

-

-	/**

-	 * The feature id for the '<em><b>Contained Element</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINED_ELEMENT = EcorePackage.EOBJECT_FEATURE_COUNT + 5;

-

-	/**

-	 * The feature id for the '<em><b>Other Reference</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__OTHER_REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 6;

-

-	/**

-	 * The feature id for the '<em><b>Description</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__DESCRIPTION = EcorePackage.EOBJECT_FEATURE_COUNT + 7;

-

-	/**

-	 * The feature id for the '<em><b>Container</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 8;

-

-	/**

-	 * The feature id for the '<em><b>Sref Container</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__SREF_CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 9;

-

-	/**

-	 * The feature id for the '<em><b>Element Map</b></em>' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 10;

-

-	/**

-	 * The feature id for the '<em><b>String To String Map</b></em>' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__STRING_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 11;

-

-	/**

-	 * The feature id for the '<em><b>Element To String Map</b></em>' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__ELEMENT_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 12;

-

-	/**

-	 * The feature id for the '<em><b>String To Element Map</b></em>' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__STRING_TO_ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 13;

-

-	/**

-	 * The feature id for the '<em><b>Non Contained NTo1</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__NON_CONTAINED_NTO1 = EcorePackage.EOBJECT_FEATURE_COUNT + 14;

-

-	/**

-	 * The feature id for the '<em><b>Non Contained 1To N</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__NON_CONTAINED_1TO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 15;

-

-	/**

-	 * The feature id for the '<em><b>Non Contained NTo M</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__NON_CONTAINED_NTO_M = EcorePackage.EOBJECT_FEATURE_COUNT + 16;

-

-	/**

-	 * The feature id for the '<em><b>Non Contained MTo N</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__NON_CONTAINED_MTO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 17;

-

-	/**

-	 * The feature id for the '<em><b>Contained Elements2</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINED_ELEMENTS2 = EcorePackage.EOBJECT_FEATURE_COUNT + 18;

-

-	/**

-	 * The feature id for the '<em><b>Container2</b></em>' container reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINER2 = EcorePackage.EOBJECT_FEATURE_COUNT + 19;

-

-	/**

-	 * The feature id for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 20;

-

-	/**

-	 * The feature id for the '<em><b>Contained Element No Opposite</b></em>' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 21;

-

-	/**

-	 * The feature id for the '<em><b>Feature Map Entries</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__FEATURE_MAP_ENTRIES = EcorePackage.EOBJECT_FEATURE_COUNT + 22;

-

-	/**

-	 * The feature id for the '<em><b>Feature Map References1</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = EcorePackage.EOBJECT_FEATURE_COUNT + 23;

-

-	/**

-	 * The feature id for the '<em><b>Feature Map References2</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = EcorePackage.EOBJECT_FEATURE_COUNT + 24;

-

-	/**

-	 * The number of structural features of the '<em>Test Element</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 25;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl

-	 * <em>Test Element To String Map</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()

-	 * @generated

-	 */

-	int TEST_ELEMENT_TO_STRING_MAP = 1;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_TO_STRING_MAP__VALUE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Key</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_TO_STRING_MAP__KEY = 1;

-

-	/**

-	 * The number of structural features of the '<em>Test Element To String Map</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_TO_STRING_MAP_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl

-	 * <em>String To String Map</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()

-	 * @generated

-	 */

-	int STRING_TO_STRING_MAP = 2;

-

-	/**

-	 * The feature id for the '<em><b>Key</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_TO_STRING_MAP__KEY = 0;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_TO_STRING_MAP__VALUE = 1;

-

-	/**

-	 * The number of structural features of the '<em>String To String Map</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_TO_STRING_MAP_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl

-	 * <em>Test Element To Test Element Map</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()

-	 * @generated

-	 */

-	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP = 3;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Key</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = 1;

-

-	/**

-	 * The number of structural features of the '<em>Test Element To Test Element Map</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl

-	 * <em>String To Test Element Map</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()

-	 * @generated

-	 */

-	int STRING_TO_TEST_ELEMENT_MAP = 4;

-

-	/**

-	 * The feature id for the '<em><b>Value</b></em>' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_TO_TEST_ELEMENT_MAP__VALUE = 0;

-

-	/**

-	 * The feature id for the '<em><b>Key</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_TO_TEST_ELEMENT_MAP__KEY = 1;

-

-	/**

-	 * The number of structural features of the '<em>String To Test Element Map</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int STRING_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl <em>Test Type</em>}'

-	 * class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()

-	 * @generated

-	 */

-	int TEST_TYPE = 5;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_TYPE__NAME = 0;

-

-	/**

-	 * The number of structural features of the '<em>Test Type</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TEST_TYPE_FEATURE_COUNT = 1;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl

-	 * <em>Type With Feature Map Non Containment</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()

-	 * @generated

-	 */

-	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = 6;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__NAME = TEST_TYPE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Map</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = TEST_TYPE_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>First Key</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = TEST_TYPE_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Second Key</b></em>' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = TEST_TYPE_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Type With Feature Map Non Containment</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;

-

-	/**

-	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl

-	 * <em>Type With Feature Map Containment</em>}' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl

-	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()

-	 * @generated

-	 */

-	int TYPE_WITH_FEATURE_MAP_CONTAINMENT = 7;

-

-	/**

-	 * The feature id for the '<em><b>Name</b></em>' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__NAME = TEST_TYPE__NAME;

-

-	/**

-	 * The feature id for the '<em><b>Map Containment</b></em>' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 0;

-

-	/**

-	 * The feature id for the '<em><b>First Key Containment</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 1;

-

-	/**

-	 * The feature id for the '<em><b>Second Key Containment</b></em>' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 2;

-

-	/**

-	 * The number of structural features of the '<em>Type With Feature Map Containment</em>' class.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 * @ordered

-	 */

-	int TYPE_WITH_FEATURE_MAP_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestElement <em>Test Element</em>}

-	 * '.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>Test Element</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement

-	 * @generated

-	 */

-	EClass getTestElement();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName

-	 * <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getName()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EAttribute getTestElement_Name();

-

-	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings <em>Strings</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute list '<em>Strings</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getStrings()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EAttribute getTestElement_Strings();

-

-	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference list '<em>References</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getReferences()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_References();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>Contained Elements</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ContainedElements();

-

-	/**

-	 * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference

-	 * <em>Reference</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Reference</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getReference()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_Reference();

-

-	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference '<em>Contained Element</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ContainedElement();

-

-	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Other Reference</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_OtherReference();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription

-	 * <em>Description</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Description</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getDescription()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EAttribute getTestElement_Description();

-

-	/**

-	 * Returns the meta object for the container reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the container reference '<em>Container</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_Container();

-

-	/**

-	 * Returns the meta object for the container reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the container reference '<em>Sref Container</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_SrefContainer();

-

-	/**

-	 * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap

-	 * <em>Element Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the map '<em>Element Map</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementMap()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ElementMap();

-

-	/**

-	 * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap

-	 * <em>String To String Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the map '<em>String To String Map</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_StringToStringMap();

-

-	/**

-	 * Returns the meta object for the map '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap <em>Element To String Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the map '<em>Element To String Map</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ElementToStringMap();

-

-	/**

-	 * Returns the meta object for the map '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap <em>String To Element Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the map '<em>String To Element Map</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_StringToElementMap();

-

-	/**

-	 * Returns the meta object for the reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Non Contained NTo1</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_NonContained_NTo1();

-

-	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference list '<em>Non Contained 1To N</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_NonContained_1ToN();

-

-	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference list '<em>Non Contained NTo M</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_NonContained_NToM();

-

-	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference list '<em>Non Contained MTo N</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_NonContained_MToN();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>Contained Elements2</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ContainedElements2();

-

-	/**

-	 * Returns the meta object for the container reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the container reference '<em>Container2</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_Container2();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite

-	 * <em>Contained Elements No Opposite</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>Contained Elements No Opposite</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ContainedElements_NoOpposite();

-

-	/**

-	 * Returns the meta object for the containment reference '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite

-	 * <em>Contained Element No Opposite</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference '<em>Contained Element No Opposite</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_ContainedElement_NoOpposite();

-

-	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute list '<em>Feature Map Entries</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EAttribute getTestElement_FeatureMapEntries();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}

-	 * '.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>Feature Map References1</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_FeatureMapReferences1();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}

-	 * '.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>Feature Map References2</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2()

-	 * @see #getTestElement()

-	 * @generated

-	 */

-	EReference getTestElement_FeatureMapReferences2();

-

-	/**

-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>Test Element To String Map</em>'.

-	 * @see java.util.Map.Entry

-	 * @model features="value key"

-	 *        valueDataType="org.eclipse.emf.ecore.EString"

-	 *        keyType="org.eclipse.emf.emfstore.test.model.TestElement"

-	 * @generated

-	 */

-	EClass getTestElementToStringMap();

-

-	/**

-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getTestElementToStringMap()

-	 * @generated

-	 */

-	EAttribute getTestElementToStringMap_Value();

-

-	/**

-	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Key</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getTestElementToStringMap()

-	 * @generated

-	 */

-	EReference getTestElementToStringMap_Key();

-

-	/**

-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To String Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>String To String Map</em>'.

-	 * @see java.util.Map.Entry

-	 * @model keyDataType="org.eclipse.emf.ecore.EString"

-	 *        valueDataType="org.eclipse.emf.ecore.EString"

-	 * @generated

-	 */

-	EClass getStringToStringMap();

-

-	/**

-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Key</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getStringToStringMap()

-	 * @generated

-	 */

-	EAttribute getStringToStringMap_Key();

-

-	/**

-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Value</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getStringToStringMap()

-	 * @generated

-	 */

-	EAttribute getStringToStringMap_Value();

-

-	/**

-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To Test Element Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>Test Element To Test Element Map</em>'.

-	 * @see java.util.Map.Entry

-	 * @model features="value key"

-	 *        valueType="org.eclipse.emf.emfstore.test.model.TestElement"

-	 *        keyType="org.eclipse.emf.emfstore.test.model.TestElement"

-	 * @generated

-	 */

-	EClass getTestElementToTestElementMap();

-

-	/**

-	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Value</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getTestElementToTestElementMap()

-	 * @generated

-	 */

-	EReference getTestElementToTestElementMap_Value();

-

-	/**

-	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Key</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getTestElementToTestElementMap()

-	 * @generated

-	 */

-	EReference getTestElementToTestElementMap_Key();

-

-	/**

-	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>String To Test Element Map</em>'.

-	 * @see java.util.Map.Entry

-	 * @model features="value key"

-	 *        valueType="org.eclipse.emf.emfstore.test.model.TestElement"

-	 *        keyDataType="org.eclipse.emf.ecore.EString"

-	 * @generated

-	 */

-	EClass getStringToTestElementMap();

-

-	/**

-	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference '<em>Value</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getStringToTestElementMap()

-	 * @generated

-	 */

-	EReference getStringToTestElementMap_Value();

-

-	/**

-	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Key</em>'.

-	 * @see java.util.Map.Entry

-	 * @see #getStringToTestElementMap()

-	 * @generated

-	 */

-	EAttribute getStringToTestElementMap_Key();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestType <em>Test Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>Test Type</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestType

-	 * @generated

-	 */

-	EClass getTestType();

-

-	/**

-	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestType#getName

-	 * <em>Name</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute '<em>Name</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TestType#getName()

-	 * @see #getTestType()

-	 * @generated

-	 */

-	EAttribute getTestType_Name();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment

-	 * <em>Type With Feature Map Non Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>Type With Feature Map Non Containment</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment

-	 * @generated

-	 */

-	EClass getTypeWithFeatureMapNonContainment();

-

-	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap <em>Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute list '<em>Map</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap()

-	 * @see #getTypeWithFeatureMapNonContainment()

-	 * @generated

-	 */

-	EAttribute getTypeWithFeatureMapNonContainment_Map();

-

-	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey <em>First Key</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference list '<em>First Key</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey()

-	 * @see #getTypeWithFeatureMapNonContainment()

-	 * @generated

-	 */

-	EReference getTypeWithFeatureMapNonContainment_FirstKey();

-

-	/**

-	 * Returns the meta object for the reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the reference list '<em>Second Key</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey()

-	 * @see #getTypeWithFeatureMapNonContainment()

-	 * @generated

-	 */

-	EReference getTypeWithFeatureMapNonContainment_SecondKey();

-

-	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment

-	 * <em>Type With Feature Map Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for class '<em>Type With Feature Map Containment</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment

-	 * @generated

-	 */

-	EClass getTypeWithFeatureMapContainment();

-

-	/**

-	 * Returns the meta object for the attribute list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment

-	 * <em>Map Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the attribute list '<em>Map Containment</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment()

-	 * @see #getTypeWithFeatureMapContainment()

-	 * @generated

-	 */

-	EAttribute getTypeWithFeatureMapContainment_MapContainment();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment

-	 * <em>First Key Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>First Key Containment</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment()

-	 * @see #getTypeWithFeatureMapContainment()

-	 * @generated

-	 */

-	EReference getTypeWithFeatureMapContainment_FirstKeyContainment();

-

-	/**

-	 * Returns the meta object for the containment reference list '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment

-	 * <em>Second Key Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the meta object for the containment reference list '<em>Second Key Containment</em>'.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment()

-	 * @see #getTypeWithFeatureMapContainment()

-	 * @generated

-	 */

-	EReference getTypeWithFeatureMapContainment_SecondKeyContainment();

-

-	/**

-	 * Returns the factory that creates the instances of the model.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the factory that creates the instances of the model.

-	 * @generated

-	 */

-	TestmodelFactory getTestmodelFactory();

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * Defines literals for the meta objects that represent

-	 * <ul>

-	 * <li>each class,</li>

-	 * <li>each feature of each class,</li>

-	 * <li>each enum,</li>

-	 * <li>and each data type</li>

-	 * </ul>

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	interface Literals {

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl

-		 * <em>Test Element</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()

-		 * @generated

-		 */

-		EClass TEST_ELEMENT = eINSTANCE.getTestElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TEST_ELEMENT__NAME = eINSTANCE.getTestElement_Name();

-

-		/**

-		 * The meta object literal for the '<em><b>Strings</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TEST_ELEMENT__STRINGS = eINSTANCE.getTestElement_Strings();

-

-		/**

-		 * The meta object literal for the '<em><b>References</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__REFERENCES = eINSTANCE.getTestElement_References();

-

-		/**

-		 * The meta object literal for the '<em><b>Contained Elements</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINED_ELEMENTS = eINSTANCE.getTestElement_ContainedElements();

-

-		/**

-		 * The meta object literal for the '<em><b>Reference</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__REFERENCE = eINSTANCE.getTestElement_Reference();

-

-		/**

-		 * The meta object literal for the '<em><b>Contained Element</b></em>' containment reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINED_ELEMENT = eINSTANCE.getTestElement_ContainedElement();

-

-		/**

-		 * The meta object literal for the '<em><b>Other Reference</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__OTHER_REFERENCE = eINSTANCE.getTestElement_OtherReference();

-

-		/**

-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TEST_ELEMENT__DESCRIPTION = eINSTANCE.getTestElement_Description();

-

-		/**

-		 * The meta object literal for the '<em><b>Container</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINER = eINSTANCE.getTestElement_Container();

-

-		/**

-		 * The meta object literal for the '<em><b>Sref Container</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__SREF_CONTAINER = eINSTANCE.getTestElement_SrefContainer();

-

-		/**

-		 * The meta object literal for the '<em><b>Element Map</b></em>' map feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__ELEMENT_MAP = eINSTANCE.getTestElement_ElementMap();

-

-		/**

-		 * The meta object literal for the '<em><b>String To String Map</b></em>' map feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__STRING_TO_STRING_MAP = eINSTANCE.getTestElement_StringToStringMap();

-

-		/**

-		 * The meta object literal for the '<em><b>Element To String Map</b></em>' map feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElement_ElementToStringMap();

-

-		/**

-		 * The meta object literal for the '<em><b>String To Element Map</b></em>' map feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__STRING_TO_ELEMENT_MAP = eINSTANCE.getTestElement_StringToElementMap();

-

-		/**

-		 * The meta object literal for the '<em><b>Non Contained NTo1</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__NON_CONTAINED_NTO1 = eINSTANCE.getTestElement_NonContained_NTo1();

-

-		/**

-		 * The meta object literal for the '<em><b>Non Contained 1To N</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__NON_CONTAINED_1TO_N = eINSTANCE.getTestElement_NonContained_1ToN();

-

-		/**

-		 * The meta object literal for the '<em><b>Non Contained NTo M</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__NON_CONTAINED_NTO_M = eINSTANCE.getTestElement_NonContained_NToM();

-

-		/**

-		 * The meta object literal for the '<em><b>Non Contained MTo N</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__NON_CONTAINED_MTO_N = eINSTANCE.getTestElement_NonContained_MToN();

-

-		/**

-		 * The meta object literal for the '<em><b>Contained Elements2</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINED_ELEMENTS2 = eINSTANCE.getTestElement_ContainedElements2();

-

-		/**

-		 * The meta object literal for the '<em><b>Container2</b></em>' container reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINER2 = eINSTANCE.getTestElement_Container2();

-

-		/**

-		 * The meta object literal for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list

-		 * feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = eINSTANCE

-			.getTestElement_ContainedElements_NoOpposite();

-

-		/**

-		 * The meta object literal for the '<em><b>Contained Element No Opposite</b></em>' containment reference

-		 * feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getTestElement_ContainedElement_NoOpposite();

-

-		/**

-		 * The meta object literal for the '<em><b>Feature Map Entries</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TEST_ELEMENT__FEATURE_MAP_ENTRIES = eINSTANCE.getTestElement_FeatureMapEntries();

-

-		/**

-		 * The meta object literal for the '<em><b>Feature Map References1</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = eINSTANCE.getTestElement_FeatureMapReferences1();

-

-		/**

-		 * The meta object literal for the '<em><b>Feature Map References2</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = eINSTANCE.getTestElement_FeatureMapReferences2();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl

-		 * <em>Test Element To String Map</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()

-		 * @generated

-		 */

-		EClass TEST_ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElementToStringMap();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TEST_ELEMENT_TO_STRING_MAP__VALUE = eINSTANCE.getTestElementToStringMap_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT_TO_STRING_MAP__KEY = eINSTANCE.getTestElementToStringMap_Key();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl

-		 * <em>String To String Map</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()

-		 * @generated

-		 */

-		EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap();

-

-		/**

-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value();

-

-		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl

-		 * <em>Test Element To Test Element Map</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()

-		 * @generated

-		 */

-		EClass TEST_ELEMENT_TO_TEST_ELEMENT_MAP = eINSTANCE.getTestElementToTestElementMap();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getTestElementToTestElementMap_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getTestElementToTestElementMap_Key();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl

-		 * <em>String To Test Element Map</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()

-		 * @generated

-		 */

-		EClass STRING_TO_TEST_ELEMENT_MAP = eINSTANCE.getStringToTestElementMap();

-

-		/**

-		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference STRING_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getStringToTestElementMap_Value();

-

-		/**

-		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute STRING_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getStringToTestElementMap_Key();

-

-		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl

-		 * <em>Test Type</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()

-		 * @generated

-		 */

-		EClass TEST_TYPE = eINSTANCE.getTestType();

-

-		/**

-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TEST_TYPE__NAME = eINSTANCE.getTestType_Name();

-

-		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl

-		 * <em>Type With Feature Map Non Containment</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()

-		 * @generated

-		 */

-		EClass TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapNonContainment();

-

-		/**

-		 * The meta object literal for the '<em><b>Map</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = eINSTANCE.getTypeWithFeatureMapNonContainment_Map();

-

-		/**

-		 * The meta object literal for the '<em><b>First Key</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = eINSTANCE

-			.getTypeWithFeatureMapNonContainment_FirstKey();

-

-		/**

-		 * The meta object literal for the '<em><b>Second Key</b></em>' reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = eINSTANCE

-			.getTypeWithFeatureMapNonContainment_SecondKey();

-

-		/**

-		 * The meta object literal for the '

-		 * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl

-		 * <em>Type With Feature Map Containment</em>}' class.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl

-		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()

-		 * @generated

-		 */

-		EClass TYPE_WITH_FEATURE_MAP_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapContainment();

-

-		/**

-		 * The meta object literal for the '<em><b>Map Containment</b></em>' attribute list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EAttribute TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = eINSTANCE

-			.getTypeWithFeatureMapContainment_MapContainment();

-

-		/**

-		 * The meta object literal for the '<em><b>First Key Containment</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = eINSTANCE

-			.getTypeWithFeatureMapContainment_FirstKeyContainment();

-

-		/**

-		 * The meta object literal for the '<em><b>Second Key Containment</b></em>' containment reference list feature.

-		 * <!-- begin-user-doc -->

-		 * <!-- end-user-doc -->

-		 * 

-		 * @generated

-		 */

-		EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = eINSTANCE

-			.getTypeWithFeatureMapContainment_SecondKeyContainment();

-

-	}

-

-} // TestmodelPackage

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EcorePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Package</b> for the model.
+ * It contains accessors for the meta objects to represent
+ * <ul>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
+ * </ul>
+ * <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelFactory
+ * @model kind="package"
+ * @generated
+ */
+public interface TestmodelPackage extends EPackage {
+	/**
+	 * The package name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	String eNAME = "test"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace URI.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	String eNS_URI = "http://eclipse.org/emf/emfstore/test/model"; //$NON-NLS-1$
+
+	/**
+	 * The package namespace name.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	String eNS_PREFIX = "org.eclipse.emf.emfstore.test.model"; //$NON-NLS-1$
+
+	/**
+	 * The singleton instance of the package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	TestmodelPackage eINSTANCE = org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl.init();
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl <em>Test Element</em>
+	 * }' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()
+	 * @generated
+	 */
+	int TEST_ELEMENT = 0;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__NAME = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>Strings</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__STRINGS = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>References</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__REFERENCES = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
+
+	/**
+	 * The feature id for the '<em><b>Contained Elements</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINED_ELEMENTS = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
+
+	/**
+	 * The feature id for the '<em><b>Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
+
+	/**
+	 * The feature id for the '<em><b>Contained Element</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINED_ELEMENT = EcorePackage.EOBJECT_FEATURE_COUNT + 5;
+
+	/**
+	 * The feature id for the '<em><b>Other Reference</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__OTHER_REFERENCE = EcorePackage.EOBJECT_FEATURE_COUNT + 6;
+
+	/**
+	 * The feature id for the '<em><b>Description</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__DESCRIPTION = EcorePackage.EOBJECT_FEATURE_COUNT + 7;
+
+	/**
+	 * The feature id for the '<em><b>Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 8;
+
+	/**
+	 * The feature id for the '<em><b>Sref Container</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__SREF_CONTAINER = EcorePackage.EOBJECT_FEATURE_COUNT + 9;
+
+	/**
+	 * The feature id for the '<em><b>Element Map</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 10;
+
+	/**
+	 * The feature id for the '<em><b>String To String Map</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__STRING_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 11;
+
+	/**
+	 * The feature id for the '<em><b>Element To String Map</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__ELEMENT_TO_STRING_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 12;
+
+	/**
+	 * The feature id for the '<em><b>String To Element Map</b></em>' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__STRING_TO_ELEMENT_MAP = EcorePackage.EOBJECT_FEATURE_COUNT + 13;
+
+	/**
+	 * The feature id for the '<em><b>Non Contained NTo1</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__NON_CONTAINED_NTO1 = EcorePackage.EOBJECT_FEATURE_COUNT + 14;
+
+	/**
+	 * The feature id for the '<em><b>Non Contained 1To N</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__NON_CONTAINED_1TO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 15;
+
+	/**
+	 * The feature id for the '<em><b>Non Contained NTo M</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__NON_CONTAINED_NTO_M = EcorePackage.EOBJECT_FEATURE_COUNT + 16;
+
+	/**
+	 * The feature id for the '<em><b>Non Contained MTo N</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__NON_CONTAINED_MTO_N = EcorePackage.EOBJECT_FEATURE_COUNT + 17;
+
+	/**
+	 * The feature id for the '<em><b>Contained Elements2</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINED_ELEMENTS2 = EcorePackage.EOBJECT_FEATURE_COUNT + 18;
+
+	/**
+	 * The feature id for the '<em><b>Container2</b></em>' container reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINER2 = EcorePackage.EOBJECT_FEATURE_COUNT + 19;
+
+	/**
+	 * The feature id for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 20;
+
+	/**
+	 * The feature id for the '<em><b>Contained Element No Opposite</b></em>' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = EcorePackage.EOBJECT_FEATURE_COUNT + 21;
+
+	/**
+	 * The feature id for the '<em><b>Feature Map Entries</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__FEATURE_MAP_ENTRIES = EcorePackage.EOBJECT_FEATURE_COUNT + 22;
+
+	/**
+	 * The feature id for the '<em><b>Feature Map References1</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = EcorePackage.EOBJECT_FEATURE_COUNT + 23;
+
+	/**
+	 * The feature id for the '<em><b>Feature Map References2</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = EcorePackage.EOBJECT_FEATURE_COUNT + 24;
+
+	/**
+	 * The number of structural features of the '<em>Test Element</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 25;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+	 * <em>Test Element To String Map</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()
+	 * @generated
+	 */
+	int TEST_ELEMENT_TO_STRING_MAP = 1;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_TO_STRING_MAP__VALUE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Key</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_TO_STRING_MAP__KEY = 1;
+
+	/**
+	 * The number of structural features of the '<em>Test Element To String Map</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+	 * <em>String To String Map</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()
+	 * @generated
+	 */
+	int STRING_TO_STRING_MAP = 2;
+
+	/**
+	 * The feature id for the '<em><b>Key</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_TO_STRING_MAP__KEY = 0;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_TO_STRING_MAP__VALUE = 1;
+
+	/**
+	 * The number of structural features of the '<em>String To String Map</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_TO_STRING_MAP_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+	 * <em>Test Element To Test Element Map</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()
+	 * @generated
+	 */
+	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP = 3;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Key</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = 1;
+
+	/**
+	 * The number of structural features of the '<em>Test Element To Test Element Map</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_ELEMENT_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+	 * <em>String To Test Element Map</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()
+	 * @generated
+	 */
+	int STRING_TO_TEST_ELEMENT_MAP = 4;
+
+	/**
+	 * The feature id for the '<em><b>Value</b></em>' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_TO_TEST_ELEMENT_MAP__VALUE = 0;
+
+	/**
+	 * The feature id for the '<em><b>Key</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_TO_TEST_ELEMENT_MAP__KEY = 1;
+
+	/**
+	 * The number of structural features of the '<em>String To Test Element Map</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int STRING_TO_TEST_ELEMENT_MAP_FEATURE_COUNT = 2;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl <em>Test Type</em>}'
+	 * class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()
+	 * @generated
+	 */
+	int TEST_TYPE = 5;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_TYPE__NAME = 0;
+
+	/**
+	 * The number of structural features of the '<em>Test Type</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TEST_TYPE_FEATURE_COUNT = 1;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+	 * <em>Type With Feature Map Non Containment</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()
+	 * @generated
+	 */
+	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = 6;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__NAME = TEST_TYPE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Map</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = TEST_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>First Key</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = TEST_TYPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Second Key</b></em>' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = TEST_TYPE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Type With Feature Map Non Containment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;
+
+	/**
+	 * The meta object id for the '{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+	 * <em>Type With Feature Map Containment</em>}' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+	 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()
+	 * @generated
+	 */
+	int TYPE_WITH_FEATURE_MAP_CONTAINMENT = 7;
+
+	/**
+	 * The feature id for the '<em><b>Name</b></em>' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__NAME = TEST_TYPE__NAME;
+
+	/**
+	 * The feature id for the '<em><b>Map Containment</b></em>' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 0;
+
+	/**
+	 * The feature id for the '<em><b>First Key Containment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 1;
+
+	/**
+	 * The feature id for the '<em><b>Second Key Containment</b></em>' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = TEST_TYPE_FEATURE_COUNT + 2;
+
+	/**
+	 * The number of structural features of the '<em>Type With Feature Map Containment</em>' class.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 * @ordered
+	 */
+	int TYPE_WITH_FEATURE_MAP_CONTAINMENT_FEATURE_COUNT = TEST_TYPE_FEATURE_COUNT + 3;
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestElement <em>Test Element</em>}
+	 * '.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Test Element</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement
+	 * @generated
+	 */
+	EClass getTestElement();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getName
+	 * <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getName()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EAttribute getTestElement_Name();
+
+	/**
+	 * Returns the meta object for the attribute list '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStrings
+	 * <em>Strings</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute list '<em>Strings</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getStrings()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EAttribute getTestElement_Strings();
+
+	/**
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getReferences <em>References</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference list '<em>References</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getReferences()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_References();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements <em>Contained Elements</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Contained Elements</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ContainedElements();
+
+	/**
+	 * Returns the meta object for the reference '{@link org.eclipse.emf.emfstore.test.model.TestElement#getReference
+	 * <em>Reference</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Reference</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getReference()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_Reference();
+
+	/**
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement <em>Contained Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Contained Element</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ContainedElement();
+
+	/**
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference <em>Other Reference</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Other Reference</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getOtherReference()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_OtherReference();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestElement#getDescription
+	 * <em>Description</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Description</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getDescription()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EAttribute getTestElement_Description();
+
+	/**
+	 * Returns the meta object for the container reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer <em>Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the container reference '<em>Container</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_Container();
+
+	/**
+	 * Returns the meta object for the container reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer <em>Sref Container</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the container reference '<em>Sref Container</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getSrefContainer()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_SrefContainer();
+
+	/**
+	 * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementMap
+	 * <em>Element Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the map '<em>Element Map</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementMap()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ElementMap();
+
+	/**
+	 * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap
+	 * <em>String To String Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the map '<em>String To String Map</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToStringMap()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_StringToStringMap();
+
+	/**
+	 * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap
+	 * <em>Element To String Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the map '<em>Element To String Map</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getElementToStringMap()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ElementToStringMap();
+
+	/**
+	 * Returns the meta object for the map '{@link org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap
+	 * <em>String To Element Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the map '<em>String To Element Map</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getStringToElementMap()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_StringToElementMap();
+
+	/**
+	 * Returns the meta object for the reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1 <em>Non Contained NTo1</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Non Contained NTo1</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NTo1()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_NonContained_NTo1();
+
+	/**
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN <em>Non Contained 1To N</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference list '<em>Non Contained 1To N</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_1ToN()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_NonContained_1ToN();
+
+	/**
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM <em>Non Contained NTo M</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference list '<em>Non Contained NTo M</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_NToM()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_NonContained_NToM();
+
+	/**
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN <em>Non Contained MTo N</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference list '<em>Non Contained MTo N</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getNonContained_MToN()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_NonContained_MToN();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2 <em>Contained Elements2</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Contained Elements2</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements2()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ContainedElements2();
+
+	/**
+	 * Returns the meta object for the container reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainer2 <em>Container2</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the container reference '<em>Container2</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainer2()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_Container2();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite
+	 * <em>Contained Elements No Opposite</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Contained Elements No Opposite</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElements_NoOpposite()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ContainedElements_NoOpposite();
+
+	/**
+	 * Returns the meta object for the containment reference '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite
+	 * <em>Contained Element No Opposite</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference '<em>Contained Element No Opposite</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getContainedElement_NoOpposite()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_ContainedElement_NoOpposite();
+
+	/**
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries <em>Feature Map Entries</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute list '<em>Feature Map Entries</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapEntries()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EAttribute getTestElement_FeatureMapEntries();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1 <em>Feature Map References1</em>}
+	 * '.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Feature Map References1</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences1()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_FeatureMapReferences1();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2 <em>Feature Map References2</em>}
+	 * '.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Feature Map References2</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement#getFeatureMapReferences2()
+	 * @see #getTestElement()
+	 * @generated
+	 */
+	EReference getTestElement_FeatureMapReferences2();
+
+	/**
+	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Test Element To String Map</em>'.
+	 * @see java.util.Map.Entry
+	 * @model features="value key"
+	 *        valueDataType="org.eclipse.emf.ecore.EString"
+	 *        keyType="org.eclipse.emf.emfstore.test.model.TestElement"
+	 * @generated
+	 */
+	EClass getTestElementToStringMap();
+
+	/**
+	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getTestElementToStringMap()
+	 * @generated
+	 */
+	EAttribute getTestElementToStringMap_Value();
+
+	/**
+	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Key</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getTestElementToStringMap()
+	 * @generated
+	 */
+	EReference getTestElementToStringMap_Key();
+
+	/**
+	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To String Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>String To String Map</em>'.
+	 * @see java.util.Map.Entry
+	 * @model keyDataType="org.eclipse.emf.ecore.EString"
+	 *        valueDataType="org.eclipse.emf.ecore.EString"
+	 * @generated
+	 */
+	EClass getStringToStringMap();
+
+	/**
+	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Key</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getStringToStringMap()
+	 * @generated
+	 */
+	EAttribute getStringToStringMap_Key();
+
+	/**
+	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Value</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getStringToStringMap()
+	 * @generated
+	 */
+	EAttribute getStringToStringMap_Value();
+
+	/**
+	 * Returns the meta object for class '{@link java.util.Map.Entry <em>Test Element To Test Element Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Test Element To Test Element Map</em>'.
+	 * @see java.util.Map.Entry
+	 * @model features="value key"
+	 *        valueType="org.eclipse.emf.emfstore.test.model.TestElement"
+	 *        keyType="org.eclipse.emf.emfstore.test.model.TestElement"
+	 * @generated
+	 */
+	EClass getTestElementToTestElementMap();
+
+	/**
+	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Value</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getTestElementToTestElementMap()
+	 * @generated
+	 */
+	EReference getTestElementToTestElementMap_Value();
+
+	/**
+	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Key</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getTestElementToTestElementMap()
+	 * @generated
+	 */
+	EReference getTestElementToTestElementMap_Key();
+
+	/**
+	 * Returns the meta object for class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>String To Test Element Map</em>'.
+	 * @see java.util.Map.Entry
+	 * @model features="value key"
+	 *        valueType="org.eclipse.emf.emfstore.test.model.TestElement"
+	 *        keyDataType="org.eclipse.emf.ecore.EString"
+	 * @generated
+	 */
+	EClass getStringToTestElementMap();
+
+	/**
+	 * Returns the meta object for the reference '{@link java.util.Map.Entry <em>Value</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference '<em>Value</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getStringToTestElementMap()
+	 * @generated
+	 */
+	EReference getStringToTestElementMap_Value();
+
+	/**
+	 * Returns the meta object for the attribute '{@link java.util.Map.Entry <em>Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Key</em>'.
+	 * @see java.util.Map.Entry
+	 * @see #getStringToTestElementMap()
+	 * @generated
+	 */
+	EAttribute getStringToTestElementMap_Key();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TestType <em>Test Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Test Type</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestType
+	 * @generated
+	 */
+	EClass getTestType();
+
+	/**
+	 * Returns the meta object for the attribute '{@link org.eclipse.emf.emfstore.test.model.TestType#getName
+	 * <em>Name</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute '<em>Name</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TestType#getName()
+	 * @see #getTestType()
+	 * @generated
+	 */
+	EAttribute getTestType_Name();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+	 * <em>Type With Feature Map Non Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Type With Feature Map Non Containment</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+	 * @generated
+	 */
+	EClass getTypeWithFeatureMapNonContainment();
+
+	/**
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap <em>Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute list '<em>Map</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap()
+	 * @see #getTypeWithFeatureMapNonContainment()
+	 * @generated
+	 */
+	EAttribute getTypeWithFeatureMapNonContainment_Map();
+
+	/**
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey <em>First Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference list '<em>First Key</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey()
+	 * @see #getTypeWithFeatureMapNonContainment()
+	 * @generated
+	 */
+	EReference getTypeWithFeatureMapNonContainment_FirstKey();
+
+	/**
+	 * Returns the meta object for the reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the reference list '<em>Second Key</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey()
+	 * @see #getTypeWithFeatureMapNonContainment()
+	 * @generated
+	 */
+	EReference getTypeWithFeatureMapNonContainment_SecondKey();
+
+	/**
+	 * Returns the meta object for class '{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+	 * <em>Type With Feature Map Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for class '<em>Type With Feature Map Containment</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+	 * @generated
+	 */
+	EClass getTypeWithFeatureMapContainment();
+
+	/**
+	 * Returns the meta object for the attribute list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment
+	 * <em>Map Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the attribute list '<em>Map Containment</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment()
+	 * @see #getTypeWithFeatureMapContainment()
+	 * @generated
+	 */
+	EAttribute getTypeWithFeatureMapContainment_MapContainment();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment
+	 * <em>First Key Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>First Key Containment</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment()
+	 * @see #getTypeWithFeatureMapContainment()
+	 * @generated
+	 */
+	EReference getTypeWithFeatureMapContainment_FirstKeyContainment();
+
+	/**
+	 * Returns the meta object for the containment reference list '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment
+	 * <em>Second Key Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the meta object for the containment reference list '<em>Second Key Containment</em>'.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment()
+	 * @see #getTypeWithFeatureMapContainment()
+	 * @generated
+	 */
+	EReference getTypeWithFeatureMapContainment_SecondKeyContainment();
+
+	/**
+	 * Returns the factory that creates the instances of the model.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the factory that creates the instances of the model.
+	 * @generated
+	 */
+	TestmodelFactory getTestmodelFactory();
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * Defines literals for the meta objects that represent
+	 * <ul>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
+	 * </ul>
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	interface Literals {
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
+		 * <em>Test Element</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElement()
+		 * @generated
+		 */
+		EClass TEST_ELEMENT = eINSTANCE.getTestElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TEST_ELEMENT__NAME = eINSTANCE.getTestElement_Name();
+
+		/**
+		 * The meta object literal for the '<em><b>Strings</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TEST_ELEMENT__STRINGS = eINSTANCE.getTestElement_Strings();
+
+		/**
+		 * The meta object literal for the '<em><b>References</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__REFERENCES = eINSTANCE.getTestElement_References();
+
+		/**
+		 * The meta object literal for the '<em><b>Contained Elements</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINED_ELEMENTS = eINSTANCE.getTestElement_ContainedElements();
+
+		/**
+		 * The meta object literal for the '<em><b>Reference</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__REFERENCE = eINSTANCE.getTestElement_Reference();
+
+		/**
+		 * The meta object literal for the '<em><b>Contained Element</b></em>' containment reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINED_ELEMENT = eINSTANCE.getTestElement_ContainedElement();
+
+		/**
+		 * The meta object literal for the '<em><b>Other Reference</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__OTHER_REFERENCE = eINSTANCE.getTestElement_OtherReference();
+
+		/**
+		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TEST_ELEMENT__DESCRIPTION = eINSTANCE.getTestElement_Description();
+
+		/**
+		 * The meta object literal for the '<em><b>Container</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINER = eINSTANCE.getTestElement_Container();
+
+		/**
+		 * The meta object literal for the '<em><b>Sref Container</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__SREF_CONTAINER = eINSTANCE.getTestElement_SrefContainer();
+
+		/**
+		 * The meta object literal for the '<em><b>Element Map</b></em>' map feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__ELEMENT_MAP = eINSTANCE.getTestElement_ElementMap();
+
+		/**
+		 * The meta object literal for the '<em><b>String To String Map</b></em>' map feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__STRING_TO_STRING_MAP = eINSTANCE.getTestElement_StringToStringMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Element To String Map</b></em>' map feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElement_ElementToStringMap();
+
+		/**
+		 * The meta object literal for the '<em><b>String To Element Map</b></em>' map feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__STRING_TO_ELEMENT_MAP = eINSTANCE.getTestElement_StringToElementMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Non Contained NTo1</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__NON_CONTAINED_NTO1 = eINSTANCE.getTestElement_NonContained_NTo1();
+
+		/**
+		 * The meta object literal for the '<em><b>Non Contained 1To N</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__NON_CONTAINED_1TO_N = eINSTANCE.getTestElement_NonContained_1ToN();
+
+		/**
+		 * The meta object literal for the '<em><b>Non Contained NTo M</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__NON_CONTAINED_NTO_M = eINSTANCE.getTestElement_NonContained_NToM();
+
+		/**
+		 * The meta object literal for the '<em><b>Non Contained MTo N</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__NON_CONTAINED_MTO_N = eINSTANCE.getTestElement_NonContained_MToN();
+
+		/**
+		 * The meta object literal for the '<em><b>Contained Elements2</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINED_ELEMENTS2 = eINSTANCE.getTestElement_ContainedElements2();
+
+		/**
+		 * The meta object literal for the '<em><b>Container2</b></em>' container reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINER2 = eINSTANCE.getTestElement_Container2();
+
+		/**
+		 * The meta object literal for the '<em><b>Contained Elements No Opposite</b></em>' containment reference list
+		 * feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE = eINSTANCE
+			.getTestElement_ContainedElements_NoOpposite();
+
+		/**
+		 * The meta object literal for the '<em><b>Contained Element No Opposite</b></em>' containment reference
+		 * feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE = eINSTANCE.getTestElement_ContainedElement_NoOpposite();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature Map Entries</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TEST_ELEMENT__FEATURE_MAP_ENTRIES = eINSTANCE.getTestElement_FeatureMapEntries();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature Map References1</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES1 = eINSTANCE.getTestElement_FeatureMapReferences1();
+
+		/**
+		 * The meta object literal for the '<em><b>Feature Map References2</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT__FEATURE_MAP_REFERENCES2 = eINSTANCE.getTestElement_FeatureMapReferences2();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+		 * <em>Test Element To String Map</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToStringMap()
+		 * @generated
+		 */
+		EClass TEST_ELEMENT_TO_STRING_MAP = eINSTANCE.getTestElementToStringMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TEST_ELEMENT_TO_STRING_MAP__VALUE = eINSTANCE.getTestElementToStringMap_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT_TO_STRING_MAP__KEY = eINSTANCE.getTestElementToStringMap_Key();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+		 * <em>String To String Map</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToStringMap()
+		 * @generated
+		 */
+		EClass STRING_TO_STRING_MAP = eINSTANCE.getStringToStringMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute STRING_TO_STRING_MAP__KEY = eINSTANCE.getStringToStringMap_Key();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute STRING_TO_STRING_MAP__VALUE = eINSTANCE.getStringToStringMap_Value();
+
+		/**
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+		 * <em>Test Element To Test Element Map</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestElementToTestElementMap()
+		 * @generated
+		 */
+		EClass TEST_ELEMENT_TO_TEST_ELEMENT_MAP = eINSTANCE.getTestElementToTestElementMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getTestElementToTestElementMap_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Key</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getTestElementToTestElementMap_Key();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+		 * <em>String To Test Element Map</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getStringToTestElementMap()
+		 * @generated
+		 */
+		EClass STRING_TO_TEST_ELEMENT_MAP = eINSTANCE.getStringToTestElementMap();
+
+		/**
+		 * The meta object literal for the '<em><b>Value</b></em>' reference feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference STRING_TO_TEST_ELEMENT_MAP__VALUE = eINSTANCE.getStringToTestElementMap_Value();
+
+		/**
+		 * The meta object literal for the '<em><b>Key</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute STRING_TO_TEST_ELEMENT_MAP__KEY = eINSTANCE.getStringToTestElementMap_Key();
+
+		/**
+		 * The meta object literal for the '{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
+		 * <em>Test Type</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTestType()
+		 * @generated
+		 */
+		EClass TEST_TYPE = eINSTANCE.getTestType();
+
+		/**
+		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TEST_TYPE__NAME = eINSTANCE.getTestType_Name();
+
+		/**
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+		 * <em>Type With Feature Map Non Containment</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapNonContainment()
+		 * @generated
+		 */
+		EClass TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapNonContainment();
+
+		/**
+		 * The meta object literal for the '<em><b>Map</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP = eINSTANCE.getTypeWithFeatureMapNonContainment_Map();
+
+		/**
+		 * The meta object literal for the '<em><b>First Key</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY = eINSTANCE
+			.getTypeWithFeatureMapNonContainment_FirstKey();
+
+		/**
+		 * The meta object literal for the '<em><b>Second Key</b></em>' reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY = eINSTANCE
+			.getTypeWithFeatureMapNonContainment_SecondKey();
+
+		/**
+		 * The meta object literal for the '
+		 * {@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+		 * <em>Type With Feature Map Containment</em>}' class.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl
+		 * @see org.eclipse.emf.emfstore.test.model.impl.TestmodelPackageImpl#getTypeWithFeatureMapContainment()
+		 * @generated
+		 */
+		EClass TYPE_WITH_FEATURE_MAP_CONTAINMENT = eINSTANCE.getTypeWithFeatureMapContainment();
+
+		/**
+		 * The meta object literal for the '<em><b>Map Containment</b></em>' attribute list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EAttribute TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT = eINSTANCE
+			.getTypeWithFeatureMapContainment_MapContainment();
+
+		/**
+		 * The meta object literal for the '<em><b>First Key Containment</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT = eINSTANCE
+			.getTypeWithFeatureMapContainment_FirstKeyContainment();
+
+		/**
+		 * The meta object literal for the '<em><b>Second Key Containment</b></em>' containment reference list feature.
+		 * <!-- begin-user-doc -->
+		 * <!-- end-user-doc -->
+		 * 
+		 * @generated
+		 */
+		EReference TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT = eINSTANCE
+			.getTypeWithFeatureMapContainment_SecondKeyContainment();
+
+	}
+
+} // TestmodelPackage
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java
index 74d960e..5e0eb80 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapContainment.java
@@ -21,22 +21,21 @@
  *
  * <p>
  * The following features are supported:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment <em>Map Containment
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment <em>First Key
- * Containment</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment <em>Second Key
- * Containment</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getMapContainment
+ * <em>Map Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getFirstKeyContainment
+ * <em>First Key Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment#getSecondKeyContainment
+ * <em>Second Key Containment</em>}</li>
+ * </ul>
  *
  * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapContainment()
  * @model
  * @generated
  */
-public interface TypeWithFeatureMapContainment extends TestType
-{
+public interface TypeWithFeatureMapContainment extends TestType {
 	/**
 	 * Returns the value of the '<em><b>Map Containment</b></em>' attribute list.
 	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java
index 869af2c..55ea5bd 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/TypeWithFeatureMapNonContainment.java
@@ -21,19 +21,19 @@
  *
  * <p>
  * The following features are supported:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getMap <em>Map</em>}</li>
  * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getFirstKey <em>First Key</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment#getSecondKey <em>Second Key</em>}
+ * </li>
  * </ul>
- * </p>
  *
  * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#getTypeWithFeatureMapNonContainment()
  * @model
  * @generated
  */
-public interface TypeWithFeatureMapNonContainment extends TestType
-{
+public interface TypeWithFeatureMapNonContainment extends TestType {
 	/**
 	 * Returns the value of the '<em><b>Map</b></em>' attribute list.
 	 * The list contents are of type {@link org.eclipse.emf.ecore.util.FeatureMap.Entry}.
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java
index 45286e5..9f61a73 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToStringMapImpl.java
@@ -1,334 +1,329 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEMap;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String To String Map</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedKey <em>Key</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedValue <em>Value</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<String, String> {

-	/**

-	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedKey()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String KEY_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedKey()

-	 * @generated

-	 * @ordered

-	 */

-	protected String key = KEY_EDEFAULT;

-

-	/**

-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected StringToStringMapImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return TestmodelPackage.Literals.STRING_TO_STRING_MAP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getTypedKey() {

-		return key;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedKey(String newKey) {

-		String oldKey = key;

-		key = newKey;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__KEY, oldKey,

-				key));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getTypedValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__VALUE,

-				oldValue, value));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:

-			return getTypedKey();

-		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:

-			return getTypedValue();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:

-			setTypedKey((String) newValue);

-			return;

-		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:

-			setTypedValue((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:

-			setTypedKey(KEY_EDEFAULT);

-			return;

-		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:

-			setTypedValue(VALUE_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:

-			return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);

-		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy())

-			return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (key: "); //$NON-NLS-1$

-		result.append(key);

-		result.append(", value: "); //$NON-NLS-1$

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected int hash = -1;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public int getHash() {

-		if (hash == -1)

-		{

-			Object theKey = getKey();

-			hash = (theKey == null ? 0 : theKey.hashCode());

-		}

-		return hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setHash(int hash) {

-		this.hash = hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getKey() {

-		return getTypedKey();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setKey(String key) {

-		setTypedKey(key);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getValue() {

-		return getTypedValue();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String setValue(String value) {

-		String oldValue = getValue();

-		setTypedValue(value);

-		return oldValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EMap<String, String> getEMap() {

-		EObject container = eContainer();

-		return container == null ? null : (EMap<String, String>) container.eGet(eContainmentFeature());

-	}

-

-} // StringToStringMapImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String To String Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<String, String> {
+	/**
+	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String KEY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected String key = KEY_EDEFAULT;
+
+	/**
+	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected StringToStringMapImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestmodelPackage.Literals.STRING_TO_STRING_MAP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getTypedKey() {
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedKey(String newKey) {
+		String oldKey = key;
+		key = newKey;
+		if (eNotificationRequired())
+			eNotify(
+				new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__KEY, oldKey, key));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getTypedValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_STRING_MAP__VALUE,
+				oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+			return getTypedKey();
+		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+			return getTypedValue();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+			setTypedKey((String) newValue);
+			return;
+		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+			setTypedValue((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+			setTypedKey(KEY_EDEFAULT);
+			return;
+		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+			setTypedValue(VALUE_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_STRING_MAP__KEY:
+			return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+		case TestmodelPackage.STRING_TO_STRING_MAP__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (key: "); //$NON-NLS-1$
+		result.append(key);
+		result.append(", value: "); //$NON-NLS-1$
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected int hash = -1;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public int getHash() {
+		if (hash == -1) {
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
+		}
+		return hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setHash(int hash) {
+		this.hash = hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getKey() {
+		return getTypedKey();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setKey(String key) {
+		setTypedKey(key);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getValue() {
+		return getTypedValue();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String setValue(String value) {
+		String oldValue = getValue();
+		setTypedValue(value);
+		return oldValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	public EMap<String, String> getEMap() {
+		EObject container = eContainer();
+		return container == null ? null : (EMap<String, String>) container.eGet(eContainmentFeature());
+	}
+
+} // StringToStringMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java
index 393396b..ca69ffa 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/StringToTestElementMapImpl.java
@@ -1,346 +1,339 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEMap;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>String To Test Element Map</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedKey <em>Key</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class StringToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<String, TestElement> {

-	/**

-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement value;

-

-	/**

-	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedKey()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String KEY_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedKey()

-	 * @generated

-	 * @ordered

-	 */

-	protected String key = KEY_EDEFAULT;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected StringToTestElementMapImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getTypedValue() {

-		if (value != null && value.eIsProxy())

-		{

-			InternalEObject oldValue = (InternalEObject) value;

-			value = (TestElement) eResolveProxy(oldValue);

-			if (value != oldValue)

-			{

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-						TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));

-			}

-		}

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetTypedValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedValue(TestElement newValue) {

-		TestElement oldValue = value;

-		value = newValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE,

-				oldValue, value));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getTypedKey() {

-		return key;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedKey(String newKey) {

-		String oldKey = key;

-		key = newKey;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY,

-				oldKey, key));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:

-			if (resolve)

-				return getTypedValue();

-			return basicGetTypedValue();

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:

-			return getTypedKey();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:

-			setTypedValue((TestElement) newValue);

-			return;

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:

-			setTypedKey((String) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:

-			setTypedValue((TestElement) null);

-			return;

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:

-			setTypedKey(KEY_EDEFAULT);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:

-			return value != null;

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:

-			return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy())

-			return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (key: "); //$NON-NLS-1$

-		result.append(key);

-		result.append(')');

-		return result.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected int hash = -1;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public int getHash() {

-		if (hash == -1)

-		{

-			Object theKey = getKey();

-			hash = (theKey == null ? 0 : theKey.hashCode());

-		}

-		return hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setHash(int hash) {

-		this.hash = hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getKey() {

-		return getTypedKey();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setKey(String key) {

-		setTypedKey(key);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getValue() {

-		return getTypedValue();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement setValue(TestElement value) {

-		TestElement oldValue = getValue();

-		setTypedValue(value);

-		return oldValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EMap<String, TestElement> getEMap() {

-		EObject container = eContainer();

-		return container == null ? null : (EMap<String, TestElement>) container.eGet(eContainmentFeature());

-	}

-

-} // StringToTestElementMapImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>String To Test Element Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.StringToTestElementMapImpl#getTypedKey <em>Key</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class StringToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<String, TestElement> {
+	/**
+	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement value;
+
+	/**
+	 * The default value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String KEY_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected String key = KEY_EDEFAULT;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected StringToTestElementMapImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getTypedValue() {
+		if (value != null && value.eIsProxy()) {
+			InternalEObject oldValue = (InternalEObject) value;
+			value = (TestElement) eResolveProxy(oldValue);
+			if (value != oldValue) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetTypedValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedValue(TestElement newValue) {
+		TestElement oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE,
+				oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getTypedKey() {
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedKey(String newKey) {
+		String oldKey = key;
+		key = newKey;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY,
+				oldKey, key));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+			if (resolve)
+				return getTypedValue();
+			return basicGetTypedValue();
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+			return getTypedKey();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+			setTypedValue((TestElement) newValue);
+			return;
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+			setTypedKey((String) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+			setTypedValue((TestElement) null);
+			return;
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+			setTypedKey(KEY_EDEFAULT);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__VALUE:
+			return value != null;
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP__KEY:
+			return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (key: "); //$NON-NLS-1$
+		result.append(key);
+		result.append(')');
+		return result.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected int hash = -1;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public int getHash() {
+		if (hash == -1) {
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
+		}
+		return hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setHash(int hash) {
+		this.hash = hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getKey() {
+		return getTypedKey();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setKey(String key) {
+		setTypedKey(key);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getValue() {
+		return getTypedValue();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement setValue(TestElement value) {
+		TestElement oldValue = getValue();
+		setTypedValue(value);
+		return oldValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	public EMap<String, TestElement> getEMap() {
+		EObject container = eContainer();
+		return container == null ? null : (EMap<String, TestElement>) container.eGet(eContainmentFeature());
+	}
+
+} // StringToTestElementMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java
index 60f20ec..87a0041 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementImpl.java
@@ -1,1600 +1,1500 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import java.util.Collection;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.notify.NotificationChain;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EStructuralFeature;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.ecore.util.BasicFeatureMap;

-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;

-import org.eclipse.emf.ecore.util.EObjectContainmentEList;

-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;

-import org.eclipse.emf.ecore.util.EObjectResolvingEList;

-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;

-import org.eclipse.emf.ecore.util.EcoreEMap;

-import org.eclipse.emf.ecore.util.EcoreUtil;

-import org.eclipse.emf.ecore.util.FeatureMap;

-import org.eclipse.emf.ecore.util.InternalEList;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Test Element</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getName <em>Name</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStrings <em>Strings</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReferences <em>References</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements <em>Contained Elements</em>}

- * </li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReference <em>Reference</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement <em>Contained Element</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getOtherReference <em>Other Reference</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getDescription <em>Description</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer <em>Container</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getSrefContainer <em>Sref Container</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementMap <em>Element Map</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToStringMap <em>String To String Map

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementToStringMap <em>Element To String Map

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToElementMap <em>String To Element Map

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NTo1 <em>Non Contained NTo1</em>}

- * </li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_1ToN <em>Non Contained 1To N

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NToM <em>Non Contained NTo M

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_MToN <em>Non Contained MTo N

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements2 <em>Contained Elements2

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer2 <em>Container2</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements_NoOpposite <em>Contained

- * Elements No Opposite</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement_NoOpposite <em>Contained

- * Element No Opposite</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapEntries <em>Feature Map Entries

- * </em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences1 <em>Feature Map

- * References1</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences2 <em>Feature Map

- * References2</em>}</li>

- * </ul>

- * </p>

- * 

- * @generated

- */

-public class TestElementImpl extends EObjectImpl implements TestElement {

-	/**

-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String NAME_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getName()

-	 * @generated

-	 * @ordered

-	 */

-	protected String name = NAME_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getStrings() <em>Strings</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getStrings()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<String> strings;

-

-	/**

-	 * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getReferences()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> references;

-

-	/**

-	 * The cached value of the '{@link #getContainedElements() <em>Contained Elements</em>}' containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getContainedElements()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> containedElements;

-

-	/**

-	 * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getReference()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement reference;

-

-	/**

-	 * The cached value of the '{@link #getContainedElement() <em>Contained Element</em>}' containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getContainedElement()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement containedElement;

-

-	/**

-	 * The cached value of the '{@link #getOtherReference() <em>Other Reference</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getOtherReference()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement otherReference;

-

-	/**

-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String DESCRIPTION_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getDescription()

-	 * @generated

-	 * @ordered

-	 */

-	protected String description = DESCRIPTION_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getElementMap() <em>Element Map</em>}' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getElementMap()

-	 * @generated

-	 * @ordered

-	 */

-	protected EMap<TestElement, TestElement> elementMap;

-

-	/**

-	 * The cached value of the '{@link #getStringToStringMap() <em>String To String Map</em>}' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getStringToStringMap()

-	 * @generated

-	 * @ordered

-	 */

-	protected EMap<String, String> stringToStringMap;

-

-	/**

-	 * The cached value of the '{@link #getElementToStringMap() <em>Element To String Map</em>}' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getElementToStringMap()

-	 * @generated

-	 * @ordered

-	 */

-	protected EMap<TestElement, String> elementToStringMap;

-

-	/**

-	 * The cached value of the '{@link #getStringToElementMap() <em>String To Element Map</em>}' map.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getStringToElementMap()

-	 * @generated

-	 * @ordered

-	 */

-	protected EMap<String, TestElement> stringToElementMap;

-

-	/**

-	 * The cached value of the '{@link #getNonContained_NTo1() <em>Non Contained NTo1</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getNonContained_NTo1()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement nonContained_NTo1;

-

-	/**

-	 * The cached value of the '{@link #getNonContained_1ToN() <em>Non Contained 1To N</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getNonContained_1ToN()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> nonContained_1ToN;

-

-	/**

-	 * The cached value of the '{@link #getNonContained_NToM() <em>Non Contained NTo M</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getNonContained_NToM()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> nonContained_NToM;

-

-	/**

-	 * The cached value of the '{@link #getNonContained_MToN() <em>Non Contained MTo N</em>}' reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getNonContained_MToN()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> nonContained_MToN;

-

-	/**

-	 * The cached value of the '{@link #getContainedElements2() <em>Contained Elements2</em>}' containment reference

-	 * list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getContainedElements2()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> containedElements2;

-

-	/**

-	 * The cached value of the '{@link #getContainedElements_NoOpposite() <em>Contained Elements No Opposite</em>}'

-	 * containment reference list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getContainedElements_NoOpposite()

-	 * @generated

-	 * @ordered

-	 */

-	protected EList<TestElement> containedElements_NoOpposite;

-

-	/**

-	 * The cached value of the '{@link #getContainedElement_NoOpposite() <em>Contained Element No Opposite</em>}'

-	 * containment reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getContainedElement_NoOpposite()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement containedElement_NoOpposite;

-

-	/**

-	 * The cached value of the '{@link #getFeatureMapEntries() <em>Feature Map Entries</em>}' attribute list.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getFeatureMapEntries()

-	 * @generated

-	 * @ordered

-	 */

-	protected FeatureMap featureMapEntries;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TestElementImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return TestmodelPackage.Literals.TEST_ELEMENT;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getName() {

-		return name;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setName(String newName) {

-		final String oldName = name;

-		name = newName;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NAME, oldName, name));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<String> getStrings() {

-		if (strings == null)

-		{

-			strings = new EDataTypeUniqueEList<String>(String.class, this, TestmodelPackage.TEST_ELEMENT__STRINGS);

-		}

-		return strings;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getReferences() {

-		if (references == null)

-		{

-			references = new EObjectResolvingEList<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__REFERENCES);

-		}

-		return references;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getContainedElements() {

-		if (containedElements == null)

-		{

-			containedElements = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestmodelPackage.TEST_ELEMENT__CONTAINER);

-		}

-		return containedElements;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getReference() {

-		if (reference != null && reference.eIsProxy())

-		{

-			final InternalEObject oldReference = (InternalEObject) reference;

-			reference = (TestElement) eResolveProxy(oldReference);

-			if (reference != oldReference)

-			{

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TestmodelPackage.TEST_ELEMENT__REFERENCE,

-						oldReference, reference));

-				}

-			}

-		}

-		return reference;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetReference() {

-		return reference;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setReference(TestElement newReference) {

-		final TestElement oldReference = reference;

-		reference = newReference;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__REFERENCE,

-				oldReference, reference));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getContainedElement() {

-		return containedElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetContainedElement(TestElement newContainedElement, NotificationChain msgs) {

-		final TestElement oldContainedElement = containedElement;

-		containedElement = newContainedElement;

-		if (eNotificationRequired())

-		{

-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,

-				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, oldContainedElement, newContainedElement);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setContainedElement(TestElement newContainedElement) {

-		if (newContainedElement != containedElement)

-		{

-			NotificationChain msgs = null;

-			if (containedElement != null) {

-				msgs = ((InternalEObject) containedElement).eInverseRemove(this,

-					TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);

-			}

-			if (newContainedElement != null) {

-				msgs = ((InternalEObject) newContainedElement).eInverseAdd(this,

-					TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);

-			}

-			msgs = basicSetContainedElement(newContainedElement, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,

-				newContainedElement, newContainedElement));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getOtherReference() {

-		if (otherReference != null && otherReference.eIsProxy())

-		{

-			final InternalEObject oldOtherReference = (InternalEObject) otherReference;

-			otherReference = (TestElement) eResolveProxy(oldOtherReference);

-			if (otherReference != oldOtherReference)

-			{

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-						TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE, oldOtherReference, otherReference));

-				}

-			}

-		}

-		return otherReference;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetOtherReference() {

-		return otherReference;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setOtherReference(TestElement newOtherReference) {

-		final TestElement oldOtherReference = otherReference;

-		otherReference = newOtherReference;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE,

-				oldOtherReference, otherReference));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getDescription() {

-		return description;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setDescription(String newDescription) {

-		final String oldDescription = description;

-		description = newDescription;

-		if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__DESCRIPTION,

-				oldDescription, description));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getContainer() {

-		if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER) {

-			return null;

-		}

-		return (TestElement) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetContainer(TestElement newContainer, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newContainer, TestmodelPackage.TEST_ELEMENT__CONTAINER, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setContainer(TestElement newContainer) {

-		if (newContainer != eInternalContainer()

-			|| eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER && newContainer != null)

-		{

-			if (EcoreUtil.isAncestor(this, newContainer))

-			{

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newContainer != null) {

-				msgs = ((InternalEObject) newContainer).eInverseAdd(this,

-					TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestElement.class, msgs);

-			}

-			msgs = basicSetContainer(newContainer, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER,

-				newContainer, newContainer));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getSrefContainer() {

-		if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER) {

-			return null;

-		}

-		return (TestElement) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetSrefContainer(TestElement newSrefContainer, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newSrefContainer, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,

-			msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setSrefContainer(TestElement newSrefContainer) {

-		if (newSrefContainer != eInternalContainer()

-			|| eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER && newSrefContainer != null)

-		{

-			if (EcoreUtil.isAncestor(this, newSrefContainer))

-			{

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newSrefContainer != null) {

-				msgs = ((InternalEObject) newSrefContainer).eInverseAdd(this,

-					TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, TestElement.class, msgs);

-			}

-			msgs = basicSetSrefContainer(newSrefContainer, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,

-				newSrefContainer, newSrefContainer));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EMap<TestElement, TestElement> getElementMap() {

-		if (elementMap == null)

-		{

-			elementMap = new EcoreEMap<TestElement, TestElement>(

-				TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP, TestElementToTestElementMapImpl.class,

-				this, TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP);

-		}

-		return elementMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EMap<String, String> getStringToStringMap() {

-		if (stringToStringMap == null)

-		{

-			stringToStringMap = new EcoreEMap<String, String>(TestmodelPackage.Literals.STRING_TO_STRING_MAP,

-				StringToStringMapImpl.class, this, TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP);

-		}

-		return stringToStringMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EMap<TestElement, String> getElementToStringMap() {

-		if (elementToStringMap == null)

-		{

-			elementToStringMap = new EcoreEMap<TestElement, String>(

-				TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP, TestElementToStringMapImpl.class, this,

-				TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP);

-		}

-		return elementToStringMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EMap<String, TestElement> getStringToElementMap() {

-		if (stringToElementMap == null)

-		{

-			stringToElementMap = new EcoreEMap<String, TestElement>(

-				TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP, StringToTestElementMapImpl.class, this,

-				TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP);

-		}

-		return stringToElementMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getNonContained_NTo1() {

-		if (nonContained_NTo1 != null && nonContained_NTo1.eIsProxy())

-		{

-			final InternalEObject oldNonContained_NTo1 = (InternalEObject) nonContained_NTo1;

-			nonContained_NTo1 = (TestElement) eResolveProxy(oldNonContained_NTo1);

-			if (nonContained_NTo1 != oldNonContained_NTo1)

-			{

-				if (eNotificationRequired()) {

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-						TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, nonContained_NTo1));

-				}

-			}

-		}

-		return nonContained_NTo1;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetNonContained_NTo1() {

-		return nonContained_NTo1;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetNonContained_NTo1(TestElement newNonContained_NTo1, NotificationChain msgs) {

-		final TestElement oldNonContained_NTo1 = nonContained_NTo1;

-		nonContained_NTo1 = newNonContained_NTo1;

-		if (eNotificationRequired())

-		{

-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,

-				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, newNonContained_NTo1);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setNonContained_NTo1(TestElement newNonContained_NTo1) {

-		if (newNonContained_NTo1 != nonContained_NTo1)

-		{

-			NotificationChain msgs = null;

-			if (nonContained_NTo1 != null) {

-				msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,

-					TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);

-			}

-			if (newNonContained_NTo1 != null) {

-				msgs = ((InternalEObject) newNonContained_NTo1).eInverseAdd(this,

-					TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);

-			}

-			msgs = basicSetNonContained_NTo1(newNonContained_NTo1, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1,

-				newNonContained_NTo1, newNonContained_NTo1));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getNonContained_1ToN() {

-		if (nonContained_1ToN == null)

-		{

-			nonContained_1ToN = new EObjectWithInverseResolvingEList<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1);

-		}

-		return nonContained_1ToN;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getNonContained_NToM() {

-		if (nonContained_NToM == null)

-		{

-			nonContained_NToM = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N);

-		}

-		return nonContained_NToM;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getNonContained_MToN() {

-		if (nonContained_MToN == null)

-		{

-			nonContained_MToN = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M);

-		}

-		return nonContained_MToN;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getContainedElements2() {

-		if (containedElements2 == null)

-		{

-			containedElements2 = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestmodelPackage.TEST_ELEMENT__CONTAINER2);

-		}

-		return containedElements2;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getContainer2() {

-		if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2) {

-			return null;

-		}

-		return (TestElement) eInternalContainer();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetContainer2(TestElement newContainer2, NotificationChain msgs) {

-		msgs = eBasicSetContainer((InternalEObject) newContainer2, TestmodelPackage.TEST_ELEMENT__CONTAINER2, msgs);

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setContainer2(TestElement newContainer2) {

-		if (newContainer2 != eInternalContainer()

-			|| eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2 && newContainer2 != null)

-		{

-			if (EcoreUtil.isAncestor(this, newContainer2))

-			{

-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$

-			}

-			NotificationChain msgs = null;

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			if (newContainer2 != null) {

-				msgs = ((InternalEObject) newContainer2).eInverseAdd(this,

-					TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestElement.class, msgs);

-			}

-			msgs = basicSetContainer2(newContainer2, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER2,

-				newContainer2, newContainer2));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getContainedElements_NoOpposite()

-	{

-		if (containedElements_NoOpposite == null)

-		{

-			containedElements_NoOpposite = new EObjectContainmentEList<TestElement>(TestElement.class, this,

-				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);

-		}

-		return containedElements_NoOpposite;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getContainedElement_NoOpposite()

-	{

-		return containedElement_NoOpposite;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public NotificationChain basicSetContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite,

-		NotificationChain msgs)

-	{

-		final TestElement oldContainedElement_NoOpposite = containedElement_NoOpposite;

-		containedElement_NoOpposite = newContainedElement_NoOpposite;

-		if (eNotificationRequired())

-		{

-			final ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,

-				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, oldContainedElement_NoOpposite,

-				newContainedElement_NoOpposite);

-			if (msgs == null) {

-				msgs = notification;

-			} else {

-				msgs.add(notification);

-			}

-		}

-		return msgs;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite)

-	{

-		if (newContainedElement_NoOpposite != containedElement_NoOpposite)

-		{

-			NotificationChain msgs = null;

-			if (containedElement_NoOpposite != null) {

-				msgs = ((InternalEObject) containedElement_NoOpposite).eInverseRemove(this, EOPPOSITE_FEATURE_BASE

-					- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);

-			}

-			if (newContainedElement_NoOpposite != null) {

-				msgs = ((InternalEObject) newContainedElement_NoOpposite).eInverseAdd(this, EOPPOSITE_FEATURE_BASE

-					- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);

-			}

-			msgs = basicSetContainedElement_NoOpposite(newContainedElement_NoOpposite, msgs);

-			if (msgs != null) {

-				msgs.dispatch();

-			}

-		}

-		else if (eNotificationRequired()) {

-			eNotify(new ENotificationImpl(this, Notification.SET,

-				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, newContainedElement_NoOpposite,

-				newContainedElement_NoOpposite));

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public FeatureMap getFeatureMapEntries()

-	{

-		if (featureMapEntries == null)

-		{

-			featureMapEntries = new BasicFeatureMap(this, TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES);

-		}

-		return featureMapEntries;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getFeatureMapReferences1()

-	{

-		return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EList<TestElement> getFeatureMapReferences2()

-	{

-		return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements())

-				.basicAdd(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:

-			if (containedElement != null) {

-				msgs = ((InternalEObject) containedElement).eInverseRemove(this, EOPPOSITE_FEATURE_BASE

-					- TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, null, msgs);

-			}

-			return basicSetContainedElement((TestElement) otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetContainer((TestElement) otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetSrefContainer((TestElement) otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:

-			if (nonContained_NTo1 != null) {

-				msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,

-					TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);

-			}

-			return basicSetNonContained_NTo1((TestElement) otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_1ToN())

-				.basicAdd(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_NToM())

-				.basicAdd(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_MToN())

-				.basicAdd(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:

-			return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements2()).basicAdd(otherEnd,

-				msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			if (eInternalContainer() != null) {

-				msgs = eBasicRemoveFromContainer(msgs);

-			}

-			return basicSetContainer2((TestElement) otherEnd, msgs);

-		}

-		return super.eInverseAdd(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:

-			return ((InternalEList<?>) getContainedElements()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:

-			return basicSetContainedElement(null, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			return basicSetContainer(null, msgs);

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			return basicSetSrefContainer(null, msgs);

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:

-			return ((InternalEList<?>) getElementMap()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:

-			return ((InternalEList<?>) getStringToStringMap()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:

-			return ((InternalEList<?>) getElementToStringMap()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:

-			return ((InternalEList<?>) getStringToElementMap()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:

-			return basicSetNonContained_NTo1(null, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:

-			return ((InternalEList<?>) getNonContained_1ToN()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:

-			return ((InternalEList<?>) getNonContained_NToM()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:

-			return ((InternalEList<?>) getNonContained_MToN()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:

-			return ((InternalEList<?>) getContainedElements2()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			return basicSetContainer2(null, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:

-			return ((InternalEList<?>) getContainedElements_NoOpposite()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:

-			return basicSetContainedElement_NoOpposite(null, msgs);

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:

-			return ((InternalEList<?>) getFeatureMapEntries()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:

-			return ((InternalEList<?>) getFeatureMapReferences1()).basicRemove(otherEnd, msgs);

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:

-			return ((InternalEList<?>) getFeatureMapReferences2()).basicRemove(otherEnd, msgs);

-		}

-		return super.eInverseRemove(otherEnd, featureID, msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {

-		switch (eContainerFeatureID())

-		{

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS,

-				TestElement.class, msgs);

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,

-				TestElement.class, msgs);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2,

-				TestElement.class, msgs);

-		}

-		return super.eBasicRemoveFromContainerFeature(msgs);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT__NAME:

-			return getName();

-		case TestmodelPackage.TEST_ELEMENT__STRINGS:

-			return getStrings();

-		case TestmodelPackage.TEST_ELEMENT__REFERENCES:

-			return getReferences();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:

-			return getContainedElements();

-		case TestmodelPackage.TEST_ELEMENT__REFERENCE:

-			if (resolve) {

-				return getReference();

-			}

-			return basicGetReference();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:

-			return getContainedElement();

-		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:

-			if (resolve) {

-				return getOtherReference();

-			}

-			return basicGetOtherReference();

-		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:

-			return getDescription();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			return getContainer();

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			return getSrefContainer();

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:

-			if (coreType) {

-				return getElementMap();

-			}

-			return getElementMap().map();

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:

-			if (coreType) {

-				return getStringToStringMap();

-			}

-			return getStringToStringMap().map();

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:

-			if (coreType) {

-				return getElementToStringMap();

-			}

-			return getElementToStringMap().map();

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:

-			if (coreType) {

-				return getStringToElementMap();

-			}

-			return getStringToElementMap().map();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:

-			if (resolve) {

-				return getNonContained_NTo1();

-			}

-			return basicGetNonContained_NTo1();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:

-			return getNonContained_1ToN();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:

-			return getNonContained_NToM();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:

-			return getNonContained_MToN();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:

-			return getContainedElements2();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			return getContainer2();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:

-			return getContainedElements_NoOpposite();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:

-			return getContainedElement_NoOpposite();

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:

-			if (coreType) {

-				return getFeatureMapEntries();

-			}

-			return ((FeatureMap.Internal) getFeatureMapEntries()).getWrapper();

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:

-			return getFeatureMapReferences1();

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:

-			return getFeatureMapReferences2();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT__NAME:

-			setName((String) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__STRINGS:

-			getStrings().clear();

-			getStrings().addAll((Collection<? extends String>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__REFERENCES:

-			getReferences().clear();

-			getReferences().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:

-			getContainedElements().clear();

-			getContainedElements().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__REFERENCE:

-			setReference((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:

-			setContainedElement((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:

-			setOtherReference((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:

-			setDescription((String) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			setContainer((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			setSrefContainer((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:

-			((EStructuralFeature.Setting) getElementMap()).set(newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:

-			((EStructuralFeature.Setting) getStringToStringMap()).set(newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:

-			((EStructuralFeature.Setting) getElementToStringMap()).set(newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:

-			((EStructuralFeature.Setting) getStringToElementMap()).set(newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:

-			setNonContained_NTo1((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:

-			getNonContained_1ToN().clear();

-			getNonContained_1ToN().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:

-			getNonContained_NToM().clear();

-			getNonContained_NToM().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:

-			getNonContained_MToN().clear();

-			getNonContained_MToN().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:

-			getContainedElements2().clear();

-			getContainedElements2().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			setContainer2((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:

-			getContainedElements_NoOpposite().clear();

-			getContainedElements_NoOpposite().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:

-			setContainedElement_NoOpposite((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:

-			((FeatureMap.Internal) getFeatureMapEntries()).set(newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:

-			getFeatureMapReferences1().clear();

-			getFeatureMapReferences1().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:

-			getFeatureMapReferences2().clear();

-			getFeatureMapReferences2().addAll((Collection<? extends TestElement>) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT__NAME:

-			setName(NAME_EDEFAULT);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__STRINGS:

-			getStrings().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__REFERENCES:

-			getReferences().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:

-			getContainedElements().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__REFERENCE:

-			setReference((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:

-			setContainedElement((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:

-			setOtherReference((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:

-			setDescription(DESCRIPTION_EDEFAULT);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			setContainer((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			setSrefContainer((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:

-			getElementMap().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:

-			getStringToStringMap().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:

-			getElementToStringMap().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:

-			getStringToElementMap().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:

-			setNonContained_NTo1((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:

-			getNonContained_1ToN().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:

-			getNonContained_NToM().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:

-			getNonContained_MToN().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:

-			getContainedElements2().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			setContainer2((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:

-			getContainedElements_NoOpposite().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:

-			setContainedElement_NoOpposite((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:

-			getFeatureMapEntries().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:

-			getFeatureMapReferences1().clear();

-			return;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:

-			getFeatureMapReferences2().clear();

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT__NAME:

-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);

-		case TestmodelPackage.TEST_ELEMENT__STRINGS:

-			return strings != null && !strings.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__REFERENCES:

-			return references != null && !references.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:

-			return containedElements != null && !containedElements.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__REFERENCE:

-			return reference != null;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:

-			return containedElement != null;

-		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:

-			return otherReference != null;

-		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:

-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER:

-			return getContainer() != null;

-		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:

-			return getSrefContainer() != null;

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:

-			return elementMap != null && !elementMap.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:

-			return stringToStringMap != null && !stringToStringMap.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:

-			return elementToStringMap != null && !elementToStringMap.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:

-			return stringToElementMap != null && !stringToElementMap.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:

-			return nonContained_NTo1 != null;

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:

-			return nonContained_1ToN != null && !nonContained_1ToN.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:

-			return nonContained_NToM != null && !nonContained_NToM.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:

-			return nonContained_MToN != null && !nonContained_MToN.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:

-			return containedElements2 != null && !containedElements2.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:

-			return getContainer2() != null;

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:

-			return containedElements_NoOpposite != null && !containedElements_NoOpposite.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:

-			return containedElement_NoOpposite != null;

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:

-			return featureMapEntries != null && !featureMapEntries.isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:

-			return !getFeatureMapReferences1().isEmpty();

-		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:

-			return !getFeatureMapReferences2().isEmpty();

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy()) {

-			return super.toString();

-		}

-

-		final StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (name: "); //$NON-NLS-1$

-		result.append(name);

-		result.append(", strings: "); //$NON-NLS-1$

-		result.append(strings);

-		result.append(", description: "); //$NON-NLS-1$

-		result.append(description);

-		result.append(", featureMapEntries: "); //$NON-NLS-1$

-		result.append(featureMapEntries);

-		result.append(')');

-		return result.toString();

-	}

-

-} // TestElementImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.ecore.util.BasicFeatureMap;
+import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
+import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
+import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
+import org.eclipse.emf.ecore.util.EcoreEMap;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.emf.ecore.util.FeatureMap;
+import org.eclipse.emf.ecore.util.InternalEList;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStrings <em>Strings</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReferences <em>References</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements <em>Contained Elements</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement <em>Contained Element</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getOtherReference <em>Other Reference</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getDescription <em>Description</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer <em>Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getSrefContainer <em>Sref Container</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementMap <em>Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToStringMap
+ * <em>String To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getElementToStringMap
+ * <em>Element To String Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getStringToElementMap
+ * <em>String To Element Map</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NTo1 <em>Non Contained NTo1</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_1ToN <em>Non Contained 1To N</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_NToM <em>Non Contained NTo M</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getNonContained_MToN <em>Non Contained MTo N</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements2
+ * <em>Contained Elements2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainer2 <em>Container2</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElements_NoOpposite
+ * <em>Contained Elements No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getContainedElement_NoOpposite
+ * <em>Contained Element No Opposite</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapEntries <em>Feature Map Entries</em>
+ * }</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences1
+ * <em>Feature Map References1</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementImpl#getFeatureMapReferences2
+ * <em>Feature Map References2</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TestElementImpl extends EObjectImpl implements TestElement {
+	/**
+	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String NAME_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getName()
+	 * @generated
+	 * @ordered
+	 */
+	protected String name = NAME_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getStrings() <em>Strings</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getStrings()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<String> strings;
+
+	/**
+	 * The cached value of the '{@link #getReferences() <em>References</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getReferences()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> references;
+
+	/**
+	 * The cached value of the '{@link #getContainedElements() <em>Contained Elements</em>}' containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getContainedElements()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> containedElements;
+
+	/**
+	 * The cached value of the '{@link #getReference() <em>Reference</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getReference()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement reference;
+
+	/**
+	 * The cached value of the '{@link #getContainedElement() <em>Contained Element</em>}' containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getContainedElement()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement containedElement;
+
+	/**
+	 * The cached value of the '{@link #getOtherReference() <em>Other Reference</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getOtherReference()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement otherReference;
+
+	/**
+	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String DESCRIPTION_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getDescription()
+	 * @generated
+	 * @ordered
+	 */
+	protected String description = DESCRIPTION_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getElementMap() <em>Element Map</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getElementMap()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap<TestElement, TestElement> elementMap;
+
+	/**
+	 * The cached value of the '{@link #getStringToStringMap() <em>String To String Map</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getStringToStringMap()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap<String, String> stringToStringMap;
+
+	/**
+	 * The cached value of the '{@link #getElementToStringMap() <em>Element To String Map</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getElementToStringMap()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap<TestElement, String> elementToStringMap;
+
+	/**
+	 * The cached value of the '{@link #getStringToElementMap() <em>String To Element Map</em>}' map.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getStringToElementMap()
+	 * @generated
+	 * @ordered
+	 */
+	protected EMap<String, TestElement> stringToElementMap;
+
+	/**
+	 * The cached value of the '{@link #getNonContained_NTo1() <em>Non Contained NTo1</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getNonContained_NTo1()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement nonContained_NTo1;
+
+	/**
+	 * The cached value of the '{@link #getNonContained_1ToN() <em>Non Contained 1To N</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getNonContained_1ToN()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> nonContained_1ToN;
+
+	/**
+	 * The cached value of the '{@link #getNonContained_NToM() <em>Non Contained NTo M</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getNonContained_NToM()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> nonContained_NToM;
+
+	/**
+	 * The cached value of the '{@link #getNonContained_MToN() <em>Non Contained MTo N</em>}' reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getNonContained_MToN()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> nonContained_MToN;
+
+	/**
+	 * The cached value of the '{@link #getContainedElements2() <em>Contained Elements2</em>}' containment reference
+	 * list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getContainedElements2()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> containedElements2;
+
+	/**
+	 * The cached value of the '{@link #getContainedElements_NoOpposite() <em>Contained Elements No Opposite</em>}'
+	 * containment reference list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getContainedElements_NoOpposite()
+	 * @generated
+	 * @ordered
+	 */
+	protected EList<TestElement> containedElements_NoOpposite;
+
+	/**
+	 * The cached value of the '{@link #getContainedElement_NoOpposite() <em>Contained Element No Opposite</em>}'
+	 * containment reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getContainedElement_NoOpposite()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement containedElement_NoOpposite;
+
+	/**
+	 * The cached value of the '{@link #getFeatureMapEntries() <em>Feature Map Entries</em>}' attribute list.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getFeatureMapEntries()
+	 * @generated
+	 * @ordered
+	 */
+	protected FeatureMap featureMapEntries;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected TestElementImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestmodelPackage.Literals.TEST_ELEMENT;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setName(String newName) {
+		String oldName = name;
+		name = newName;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NAME, oldName, name));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<String> getStrings() {
+		if (strings == null) {
+			strings = new EDataTypeUniqueEList<String>(String.class, this, TestmodelPackage.TEST_ELEMENT__STRINGS);
+		}
+		return strings;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getReferences() {
+		if (references == null) {
+			references = new EObjectResolvingEList<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__REFERENCES);
+		}
+		return references;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getContainedElements() {
+		if (containedElements == null) {
+			containedElements = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestmodelPackage.TEST_ELEMENT__CONTAINER);
+		}
+		return containedElements;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getReference() {
+		if (reference != null && reference.eIsProxy()) {
+			InternalEObject oldReference = (InternalEObject) reference;
+			reference = (TestElement) eResolveProxy(oldReference);
+			if (reference != oldReference) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, TestmodelPackage.TEST_ELEMENT__REFERENCE,
+						oldReference, reference));
+			}
+		}
+		return reference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetReference() {
+		return reference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setReference(TestElement newReference) {
+		TestElement oldReference = reference;
+		reference = newReference;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__REFERENCE,
+				oldReference, reference));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getContainedElement() {
+		return containedElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetContainedElement(TestElement newContainedElement, NotificationChain msgs) {
+		TestElement oldContainedElement = containedElement;
+		containedElement = newContainedElement;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, oldContainedElement, newContainedElement);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setContainedElement(TestElement newContainedElement) {
+		if (newContainedElement != containedElement) {
+			NotificationChain msgs = null;
+			if (containedElement != null)
+				msgs = ((InternalEObject) containedElement).eInverseRemove(this,
+					TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);
+			if (newContainedElement != null)
+				msgs = ((InternalEObject) newContainedElement).eInverseAdd(this,
+					TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER, TestElement.class, msgs);
+			msgs = basicSetContainedElement(newContainedElement, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,
+				newContainedElement, newContainedElement));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getOtherReference() {
+		if (otherReference != null && otherReference.eIsProxy()) {
+			InternalEObject oldOtherReference = (InternalEObject) otherReference;
+			otherReference = (TestElement) eResolveProxy(oldOtherReference);
+			if (otherReference != oldOtherReference) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE, oldOtherReference, otherReference));
+			}
+		}
+		return otherReference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetOtherReference() {
+		return otherReference;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setOtherReference(TestElement newOtherReference) {
+		TestElement oldOtherReference = otherReference;
+		otherReference = newOtherReference;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE,
+				oldOtherReference, otherReference));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getDescription() {
+		return description;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setDescription(String newDescription) {
+		String oldDescription = description;
+		description = newDescription;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__DESCRIPTION,
+				oldDescription, description));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getContainer() {
+		if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER)
+			return null;
+		return (TestElement) eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetContainer(TestElement newContainer, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject) newContainer, TestmodelPackage.TEST_ELEMENT__CONTAINER, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setContainer(TestElement newContainer) {
+		if (newContainer != eInternalContainer()
+			|| (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER && newContainer != null)) {
+			if (EcoreUtil.isAncestor(this, newContainer))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newContainer != null)
+				msgs = ((InternalEObject) newContainer).eInverseAdd(this,
+					TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS, TestElement.class, msgs);
+			msgs = basicSetContainer(newContainer, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER,
+				newContainer, newContainer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getSrefContainer() {
+		if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER)
+			return null;
+		return (TestElement) eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetSrefContainer(TestElement newSrefContainer, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject) newSrefContainer, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,
+			msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setSrefContainer(TestElement newSrefContainer) {
+		if (newSrefContainer != eInternalContainer()
+			|| (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER && newSrefContainer != null)) {
+			if (EcoreUtil.isAncestor(this, newSrefContainer))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newSrefContainer != null)
+				msgs = ((InternalEObject) newSrefContainer).eInverseAdd(this,
+					TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, TestElement.class, msgs);
+			msgs = basicSetSrefContainer(newSrefContainer, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER,
+				newSrefContainer, newSrefContainer));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EMap<TestElement, TestElement> getElementMap() {
+		if (elementMap == null) {
+			elementMap = new EcoreEMap<TestElement, TestElement>(
+				TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP, TestElementToTestElementMapImpl.class, this,
+				TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP);
+		}
+		return elementMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EMap<String, String> getStringToStringMap() {
+		if (stringToStringMap == null) {
+			stringToStringMap = new EcoreEMap<String, String>(TestmodelPackage.Literals.STRING_TO_STRING_MAP,
+				StringToStringMapImpl.class, this, TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP);
+		}
+		return stringToStringMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EMap<TestElement, String> getElementToStringMap() {
+		if (elementToStringMap == null) {
+			elementToStringMap = new EcoreEMap<TestElement, String>(
+				TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP, TestElementToStringMapImpl.class, this,
+				TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP);
+		}
+		return elementToStringMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EMap<String, TestElement> getStringToElementMap() {
+		if (stringToElementMap == null) {
+			stringToElementMap = new EcoreEMap<String, TestElement>(
+				TestmodelPackage.Literals.STRING_TO_TEST_ELEMENT_MAP, StringToTestElementMapImpl.class, this,
+				TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP);
+		}
+		return stringToElementMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getNonContained_NTo1() {
+		if (nonContained_NTo1 != null && nonContained_NTo1.eIsProxy()) {
+			InternalEObject oldNonContained_NTo1 = (InternalEObject) nonContained_NTo1;
+			nonContained_NTo1 = (TestElement) eResolveProxy(oldNonContained_NTo1);
+			if (nonContained_NTo1 != oldNonContained_NTo1) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, nonContained_NTo1));
+			}
+		}
+		return nonContained_NTo1;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetNonContained_NTo1() {
+		return nonContained_NTo1;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetNonContained_NTo1(TestElement newNonContained_NTo1, NotificationChain msgs) {
+		TestElement oldNonContained_NTo1 = nonContained_NTo1;
+		nonContained_NTo1 = newNonContained_NTo1;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1, oldNonContained_NTo1, newNonContained_NTo1);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setNonContained_NTo1(TestElement newNonContained_NTo1) {
+		if (newNonContained_NTo1 != nonContained_NTo1) {
+			NotificationChain msgs = null;
+			if (nonContained_NTo1 != null)
+				msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,
+					TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
+			if (newNonContained_NTo1 != null)
+				msgs = ((InternalEObject) newNonContained_NTo1).eInverseAdd(this,
+					TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
+			msgs = basicSetNonContained_NTo1(newNonContained_NTo1, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1,
+				newNonContained_NTo1, newNonContained_NTo1));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getNonContained_1ToN() {
+		if (nonContained_1ToN == null) {
+			nonContained_1ToN = new EObjectWithInverseResolvingEList<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1);
+		}
+		return nonContained_1ToN;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getNonContained_NToM() {
+		if (nonContained_NToM == null) {
+			nonContained_NToM = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N);
+		}
+		return nonContained_NToM;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getNonContained_MToN() {
+		if (nonContained_MToN == null) {
+			nonContained_MToN = new EObjectWithInverseResolvingEList.ManyInverse<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N, TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M);
+		}
+		return nonContained_MToN;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getContainedElements2() {
+		if (containedElements2 == null) {
+			containedElements2 = new EObjectContainmentWithInverseEList<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestmodelPackage.TEST_ELEMENT__CONTAINER2);
+		}
+		return containedElements2;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getContainer2() {
+		if (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2)
+			return null;
+		return (TestElement) eInternalContainer();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetContainer2(TestElement newContainer2, NotificationChain msgs) {
+		msgs = eBasicSetContainer((InternalEObject) newContainer2, TestmodelPackage.TEST_ELEMENT__CONTAINER2, msgs);
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setContainer2(TestElement newContainer2) {
+		if (newContainer2 != eInternalContainer()
+			|| (eContainerFeatureID() != TestmodelPackage.TEST_ELEMENT__CONTAINER2 && newContainer2 != null)) {
+			if (EcoreUtil.isAncestor(this, newContainer2))
+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
+			NotificationChain msgs = null;
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			if (newContainer2 != null)
+				msgs = ((InternalEObject) newContainer2).eInverseAdd(this,
+					TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2, TestElement.class, msgs);
+			msgs = basicSetContainer2(newContainer2, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT__CONTAINER2,
+				newContainer2, newContainer2));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getContainedElements_NoOpposite() {
+		if (containedElements_NoOpposite == null) {
+			containedElements_NoOpposite = new EObjectContainmentEList<TestElement>(TestElement.class, this,
+				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);
+		}
+		return containedElements_NoOpposite;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getContainedElement_NoOpposite() {
+		return containedElement_NoOpposite;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public NotificationChain basicSetContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite,
+		NotificationChain msgs) {
+		TestElement oldContainedElement_NoOpposite = containedElement_NoOpposite;
+		containedElement_NoOpposite = newContainedElement_NoOpposite;
+		if (eNotificationRequired()) {
+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
+				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, oldContainedElement_NoOpposite,
+				newContainedElement_NoOpposite);
+			if (msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
+		}
+		return msgs;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setContainedElement_NoOpposite(TestElement newContainedElement_NoOpposite) {
+		if (newContainedElement_NoOpposite != containedElement_NoOpposite) {
+			NotificationChain msgs = null;
+			if (containedElement_NoOpposite != null)
+				msgs = ((InternalEObject) containedElement_NoOpposite).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);
+			if (newContainedElement_NoOpposite != null)
+				msgs = ((InternalEObject) newContainedElement_NoOpposite).eInverseAdd(this,
+					EOPPOSITE_FEATURE_BASE - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, null, msgs);
+			msgs = basicSetContainedElement_NoOpposite(newContainedElement_NoOpposite, msgs);
+			if (msgs != null)
+				msgs.dispatch();
+		} else if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+				TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE, newContainedElement_NoOpposite,
+				newContainedElement_NoOpposite));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public FeatureMap getFeatureMapEntries() {
+		if (featureMapEntries == null) {
+			featureMapEntries = new BasicFeatureMap(this, TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES);
+		}
+		return featureMapEntries;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getFeatureMapReferences1() {
+		return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EList<TestElement> getFeatureMapReferences2() {
+		return getFeatureMapEntries().list(TestmodelPackage.Literals.TEST_ELEMENT__FEATURE_MAP_REFERENCES2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements()).basicAdd(otherEnd,
+				msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+			if (containedElement != null)
+				msgs = ((InternalEObject) containedElement).eInverseRemove(this,
+					EOPPOSITE_FEATURE_BASE - TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT, null, msgs);
+			return basicSetContainedElement((TestElement) otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			return basicSetContainer((TestElement) otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			return basicSetSrefContainer((TestElement) otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+			if (nonContained_NTo1 != null)
+				msgs = ((InternalEObject) nonContained_NTo1).eInverseRemove(this,
+					TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N, TestElement.class, msgs);
+			return basicSetNonContained_NTo1((TestElement) otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_1ToN()).basicAdd(otherEnd,
+				msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_NToM()).basicAdd(otherEnd,
+				msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getNonContained_MToN()).basicAdd(otherEnd,
+				msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+			return ((InternalEList<InternalEObject>) (InternalEList<?>) getContainedElements2()).basicAdd(otherEnd,
+				msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			if (eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			return basicSetContainer2((TestElement) otherEnd, msgs);
+		}
+		return super.eInverseAdd(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+			return ((InternalEList<?>) getContainedElements()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+			return basicSetContainedElement(null, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			return basicSetContainer(null, msgs);
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			return basicSetSrefContainer(null, msgs);
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+			return ((InternalEList<?>) getElementMap()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+			return ((InternalEList<?>) getStringToStringMap()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+			return ((InternalEList<?>) getElementToStringMap()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+			return ((InternalEList<?>) getStringToElementMap()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+			return basicSetNonContained_NTo1(null, msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+			return ((InternalEList<?>) getNonContained_1ToN()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+			return ((InternalEList<?>) getNonContained_NToM()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+			return ((InternalEList<?>) getNonContained_MToN()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+			return ((InternalEList<?>) getContainedElements2()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			return basicSetContainer2(null, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+			return ((InternalEList<?>) getContainedElements_NoOpposite()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+			return basicSetContainedElement_NoOpposite(null, msgs);
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+			return ((InternalEList<?>) getFeatureMapEntries()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+			return ((InternalEList<?>) getFeatureMapReferences1()).basicRemove(otherEnd, msgs);
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+			return ((InternalEList<?>) getFeatureMapReferences2()).basicRemove(otherEnd, msgs);
+		}
+		return super.eInverseRemove(otherEnd, featureID, msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch (eContainerFeatureID()) {
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS,
+				TestElement.class, msgs);
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT,
+				TestElement.class, msgs);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			return eInternalContainer().eInverseRemove(this, TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2,
+				TestElement.class, msgs);
+		}
+		return super.eBasicRemoveFromContainerFeature(msgs);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT__NAME:
+			return getName();
+		case TestmodelPackage.TEST_ELEMENT__STRINGS:
+			return getStrings();
+		case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+			return getReferences();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+			return getContainedElements();
+		case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+			if (resolve)
+				return getReference();
+			return basicGetReference();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+			return getContainedElement();
+		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+			if (resolve)
+				return getOtherReference();
+			return basicGetOtherReference();
+		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+			return getDescription();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			return getContainer();
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			return getSrefContainer();
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+			if (coreType)
+				return getElementMap();
+			else
+				return getElementMap().map();
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+			if (coreType)
+				return getStringToStringMap();
+			else
+				return getStringToStringMap().map();
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+			if (coreType)
+				return getElementToStringMap();
+			else
+				return getElementToStringMap().map();
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+			if (coreType)
+				return getStringToElementMap();
+			else
+				return getStringToElementMap().map();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+			if (resolve)
+				return getNonContained_NTo1();
+			return basicGetNonContained_NTo1();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+			return getNonContained_1ToN();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+			return getNonContained_NToM();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+			return getNonContained_MToN();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+			return getContainedElements2();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			return getContainer2();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+			return getContainedElements_NoOpposite();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+			return getContainedElement_NoOpposite();
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+			if (coreType)
+				return getFeatureMapEntries();
+			return ((FeatureMap.Internal) getFeatureMapEntries()).getWrapper();
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+			return getFeatureMapReferences1();
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+			return getFeatureMapReferences2();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT__NAME:
+			setName((String) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__STRINGS:
+			getStrings().clear();
+			getStrings().addAll((Collection<? extends String>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+			getReferences().clear();
+			getReferences().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+			getContainedElements().clear();
+			getContainedElements().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+			setReference((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+			setContainedElement((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+			setOtherReference((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+			setDescription((String) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			setContainer((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			setSrefContainer((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+			((EStructuralFeature.Setting) getElementMap()).set(newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+			((EStructuralFeature.Setting) getStringToStringMap()).set(newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+			((EStructuralFeature.Setting) getElementToStringMap()).set(newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+			((EStructuralFeature.Setting) getStringToElementMap()).set(newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+			setNonContained_NTo1((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+			getNonContained_1ToN().clear();
+			getNonContained_1ToN().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+			getNonContained_NToM().clear();
+			getNonContained_NToM().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+			getNonContained_MToN().clear();
+			getNonContained_MToN().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+			getContainedElements2().clear();
+			getContainedElements2().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			setContainer2((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+			getContainedElements_NoOpposite().clear();
+			getContainedElements_NoOpposite().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+			setContainedElement_NoOpposite((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+			((FeatureMap.Internal) getFeatureMapEntries()).set(newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+			getFeatureMapReferences1().clear();
+			getFeatureMapReferences1().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+			getFeatureMapReferences2().clear();
+			getFeatureMapReferences2().addAll((Collection<? extends TestElement>) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__STRINGS:
+			getStrings().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+			getReferences().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+			getContainedElements().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+			setReference((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+			setContainedElement((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+			setOtherReference((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+			setDescription(DESCRIPTION_EDEFAULT);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			setContainer((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			setSrefContainer((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+			getElementMap().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+			getStringToStringMap().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+			getElementToStringMap().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+			getStringToElementMap().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+			setNonContained_NTo1((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+			getNonContained_1ToN().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+			getNonContained_NToM().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+			getNonContained_MToN().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+			getContainedElements2().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			setContainer2((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+			getContainedElements_NoOpposite().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+			setContainedElement_NoOpposite((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+			getFeatureMapEntries().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+			getFeatureMapReferences1().clear();
+			return;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+			getFeatureMapReferences2().clear();
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case TestmodelPackage.TEST_ELEMENT__STRINGS:
+			return strings != null && !strings.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__REFERENCES:
+			return references != null && !references.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS:
+			return containedElements != null && !containedElements.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__REFERENCE:
+			return reference != null;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT:
+			return containedElement != null;
+		case TestmodelPackage.TEST_ELEMENT__OTHER_REFERENCE:
+			return otherReference != null;
+		case TestmodelPackage.TEST_ELEMENT__DESCRIPTION:
+			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER:
+			return getContainer() != null;
+		case TestmodelPackage.TEST_ELEMENT__SREF_CONTAINER:
+			return getSrefContainer() != null;
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_MAP:
+			return elementMap != null && !elementMap.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_STRING_MAP:
+			return stringToStringMap != null && !stringToStringMap.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__ELEMENT_TO_STRING_MAP:
+			return elementToStringMap != null && !elementToStringMap.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__STRING_TO_ELEMENT_MAP:
+			return stringToElementMap != null && !stringToElementMap.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO1:
+			return nonContained_NTo1 != null;
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_1TO_N:
+			return nonContained_1ToN != null && !nonContained_1ToN.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_NTO_M:
+			return nonContained_NToM != null && !nonContained_NToM.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__NON_CONTAINED_MTO_N:
+			return nonContained_MToN != null && !nonContained_MToN.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS2:
+			return containedElements2 != null && !containedElements2.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINER2:
+			return getContainer2() != null;
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE:
+			return containedElements_NoOpposite != null && !containedElements_NoOpposite.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE:
+			return containedElement_NoOpposite != null;
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_ENTRIES:
+			return featureMapEntries != null && !featureMapEntries.isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES1:
+			return !getFeatureMapReferences1().isEmpty();
+		case TestmodelPackage.TEST_ELEMENT__FEATURE_MAP_REFERENCES2:
+			return !getFeatureMapReferences2().isEmpty();
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (name: "); //$NON-NLS-1$
+		result.append(name);
+		result.append(", strings: "); //$NON-NLS-1$
+		result.append(strings);
+		result.append(", description: "); //$NON-NLS-1$
+		result.append(description);
+		result.append(", featureMapEntries: "); //$NON-NLS-1$
+		result.append(featureMapEntries);
+		result.append(')');
+		return result.toString();
+	}
+
+} // TestElementImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java
index 516ea65..d60b005 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToStringMapImpl.java
@@ -1,346 +1,339 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEMap;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Test Element To String Map</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedKey <em>Key</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class TestElementToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, String> {

-	/**

-	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected static final String VALUE_EDEFAULT = null;

-

-	/**

-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected String value = VALUE_EDEFAULT;

-

-	/**

-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedKey()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement key;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TestElementToStringMapImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getTypedValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedValue(String newValue) {

-		String oldValue = value;

-		value = newValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE,

-				oldValue, value));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getTypedKey() {

-		if (key != null && key.eIsProxy())

-		{

-			InternalEObject oldKey = (InternalEObject) key;

-			key = (TestElement) eResolveProxy(oldKey);

-			if (key != oldKey)

-			{

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-						TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY, oldKey, key));

-			}

-		}

-		return key;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetTypedKey() {

-		return key;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedKey(TestElement newKey) {

-		TestElement oldKey = key;

-		key = newKey;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY,

-				oldKey, key));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:

-			return getTypedValue();

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:

-			if (resolve)

-				return getTypedKey();

-			return basicGetTypedKey();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:

-			setTypedValue((String) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:

-			setTypedKey((TestElement) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:

-			setTypedValue(VALUE_EDEFAULT);

-			return;

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:

-			setTypedKey((TestElement) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:

-			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:

-			return key != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public String toString() {

-		if (eIsProxy())

-			return super.toString();

-

-		StringBuffer result = new StringBuffer(super.toString());

-		result.append(" (value: "); //$NON-NLS-1$

-		result.append(value);

-		result.append(')');

-		return result.toString();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected int hash = -1;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public int getHash() {

-		if (hash == -1)

-		{

-			Object theKey = getKey();

-			hash = (theKey == null ? 0 : theKey.hashCode());

-		}

-		return hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setHash(int hash) {

-		this.hash = hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getKey() {

-		return getTypedKey();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setKey(TestElement key) {

-		setTypedKey(key);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String getValue() {

-		return getTypedValue();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public String setValue(String value) {

-		String oldValue = getValue();

-		setTypedValue(value);

-		return oldValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EMap<TestElement, String> getEMap() {

-		EObject container = eContainer();

-		return container == null ? null : (EMap<TestElement, String>) container.eGet(eContainmentFeature());

-	}

-

-} // TestElementToStringMapImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element To String Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedValue <em>Value</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToStringMapImpl#getTypedKey <em>Key</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TestElementToStringMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, String> {
+	/**
+	 * The default value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected static final String VALUE_EDEFAULT = null;
+
+	/**
+	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' attribute.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected String value = VALUE_EDEFAULT;
+
+	/**
+	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement key;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected TestElementToStringMapImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestmodelPackage.Literals.TEST_ELEMENT_TO_STRING_MAP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getTypedValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedValue(String newValue) {
+		String oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE,
+				oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getTypedKey() {
+		if (key != null && key.eIsProxy()) {
+			InternalEObject oldKey = (InternalEObject) key;
+			key = (TestElement) eResolveProxy(oldKey);
+			if (key != oldKey) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY, oldKey, key));
+			}
+		}
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetTypedKey() {
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedKey(TestElement newKey) {
+		TestElement oldKey = key;
+		key = newKey;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET, TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY,
+				oldKey, key));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+			return getTypedValue();
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+			if (resolve)
+				return getTypedKey();
+			return basicGetTypedKey();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+			setTypedValue((String) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+			setTypedKey((TestElement) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+			setTypedValue(VALUE_EDEFAULT);
+			return;
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+			setTypedKey((TestElement) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__VALUE:
+			return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP__KEY:
+			return key != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public String toString() {
+		if (eIsProxy())
+			return super.toString();
+
+		StringBuffer result = new StringBuffer(super.toString());
+		result.append(" (value: "); //$NON-NLS-1$
+		result.append(value);
+		result.append(')');
+		return result.toString();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected int hash = -1;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public int getHash() {
+		if (hash == -1) {
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
+		}
+		return hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setHash(int hash) {
+		this.hash = hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getKey() {
+		return getTypedKey();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setKey(TestElement key) {
+		setTypedKey(key);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String getValue() {
+		return getTypedValue();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public String setValue(String value) {
+		String oldValue = getValue();
+		setTypedValue(value);
+		return oldValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	public EMap<TestElement, String> getEMap() {
+		EObject container = eContainer();
+		return container == null ? null : (EMap<TestElement, String>) container.eGet(eContainmentFeature());
+	}
+
+} // TestElementToStringMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java
index d648319..82376bd 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestElementToTestElementMapImpl.java
@@ -1,340 +1,332 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import org.eclipse.emf.common.notify.Notification;

-import org.eclipse.emf.common.util.BasicEMap;

-import org.eclipse.emf.common.util.EMap;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.InternalEObject;

-import org.eclipse.emf.ecore.impl.ENotificationImpl;

-import org.eclipse.emf.ecore.impl.EObjectImpl;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model object '<em><b>Test Element To Test Element Map</b></em>'.

- * <!-- end-user-doc -->

- * <p>

- * The following features are implemented:

- * <ul>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedValue <em>Value</em>}</li>

- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedKey <em>Key</em>}</li>

- * </ul>

- * </p>

- *

- * @generated

- */

-public class TestElementToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, TestElement> {

-	/**

-	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedValue()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement value;

-

-	/**

-	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @see #getTypedKey()

-	 * @generated

-	 * @ordered

-	 */

-	protected TestElement key;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TestElementToTestElementMapImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	protected EClass eStaticClass() {

-		return TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getTypedValue() {

-		if (value != null && value.eIsProxy())

-		{

-			InternalEObject oldValue = (InternalEObject) value;

-			value = (TestElement) eResolveProxy(oldValue);

-			if (value != oldValue)

-			{

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-						TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));

-			}

-		}

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetTypedValue() {

-		return value;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedValue(TestElement newValue) {

-		TestElement oldValue = value;

-		value = newValue;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET,

-				TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getTypedKey() {

-		if (key != null && key.eIsProxy())

-		{

-			InternalEObject oldKey = (InternalEObject) key;

-			key = (TestElement) eResolveProxy(oldKey);

-			if (key != oldKey)

-			{

-				if (eNotificationRequired())

-					eNotify(new ENotificationImpl(this, Notification.RESOLVE,

-						TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));

-			}

-		}

-		return key;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement basicGetTypedKey() {

-		return key;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setTypedKey(TestElement newKey) {

-		TestElement oldKey = key;

-		key = newKey;

-		if (eNotificationRequired())

-			eNotify(new ENotificationImpl(this, Notification.SET,

-				TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public Object eGet(int featureID, boolean resolve, boolean coreType) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:

-			if (resolve)

-				return getTypedValue();

-			return basicGetTypedValue();

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:

-			if (resolve)

-				return getTypedKey();

-			return basicGetTypedKey();

-		}

-		return super.eGet(featureID, resolve, coreType);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eSet(int featureID, Object newValue) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:

-			setTypedValue((TestElement) newValue);

-			return;

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:

-			setTypedKey((TestElement) newValue);

-			return;

-		}

-		super.eSet(featureID, newValue);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public void eUnset(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:

-			setTypedValue((TestElement) null);

-			return;

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:

-			setTypedKey((TestElement) null);

-			return;

-		}

-		super.eUnset(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public boolean eIsSet(int featureID) {

-		switch (featureID)

-		{

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:

-			return value != null;

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:

-			return key != null;

-		}

-		return super.eIsSet(featureID);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected int hash = -1;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public int getHash() {

-		if (hash == -1)

-		{

-			Object theKey = getKey();

-			hash = (theKey == null ? 0 : theKey.hashCode());

-		}

-		return hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setHash(int hash) {

-		this.hash = hash;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getKey() {

-		return getTypedKey();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void setKey(TestElement key) {

-		setTypedKey(key);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement getValue() {

-		return getTypedValue();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement setValue(TestElement value) {

-		TestElement oldValue = getValue();

-		setTypedValue(value);

-		return oldValue;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@SuppressWarnings("unchecked")

-	public EMap<TestElement, TestElement> getEMap() {

-		EObject container = eContainer();

-		return container == null ? null : (EMap<TestElement, TestElement>) container.eGet(eContainmentFeature());

-	}

-

-} // TestElementToTestElementMapImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.BasicEMap;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Test Element To Test Element Map</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedValue <em>Value</em>}
+ * </li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestElementToTestElementMapImpl#getTypedKey <em>Key</em>}</li>
+ * </ul>
+ *
+ * @generated
+ */
+public class TestElementToTestElementMapImpl extends EObjectImpl implements BasicEMap.Entry<TestElement, TestElement> {
+	/**
+	 * The cached value of the '{@link #getTypedValue() <em>Value</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedValue()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement value;
+
+	/**
+	 * The cached value of the '{@link #getTypedKey() <em>Key</em>}' reference.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @see #getTypedKey()
+	 * @generated
+	 * @ordered
+	 */
+	protected TestElement key;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected TestElementToTestElementMapImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	protected EClass eStaticClass() {
+		return TestmodelPackage.Literals.TEST_ELEMENT_TO_TEST_ELEMENT_MAP;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getTypedValue() {
+		if (value != null && value.eIsProxy()) {
+			InternalEObject oldValue = (InternalEObject) value;
+			value = (TestElement) eResolveProxy(oldValue);
+			if (value != oldValue) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetTypedValue() {
+		return value;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedValue(TestElement newValue) {
+		TestElement oldValue = value;
+		value = newValue;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+				TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE, oldValue, value));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getTypedKey() {
+		if (key != null && key.eIsProxy()) {
+			InternalEObject oldKey = (InternalEObject) key;
+			key = (TestElement) eResolveProxy(oldKey);
+			if (key != oldKey) {
+				if (eNotificationRequired())
+					eNotify(new ENotificationImpl(this, Notification.RESOLVE,
+						TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));
+			}
+		}
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement basicGetTypedKey() {
+		return key;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setTypedKey(TestElement newKey) {
+		TestElement oldKey = key;
+		key = newKey;
+		if (eNotificationRequired())
+			eNotify(new ENotificationImpl(this, Notification.SET,
+				TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY, oldKey, key));
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+			if (resolve)
+				return getTypedValue();
+			return basicGetTypedValue();
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+			if (resolve)
+				return getTypedKey();
+			return basicGetTypedKey();
+		}
+		return super.eGet(featureID, resolve, coreType);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+			setTypedValue((TestElement) newValue);
+			return;
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+			setTypedKey((TestElement) newValue);
+			return;
+		}
+		super.eSet(featureID, newValue);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public void eUnset(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+			setTypedValue((TestElement) null);
+			return;
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+			setTypedKey((TestElement) null);
+			return;
+		}
+		super.eUnset(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE:
+			return value != null;
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY:
+			return key != null;
+		}
+		return super.eIsSet(featureID);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected int hash = -1;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public int getHash() {
+		if (hash == -1) {
+			Object theKey = getKey();
+			hash = (theKey == null ? 0 : theKey.hashCode());
+		}
+		return hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setHash(int hash) {
+		this.hash = hash;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getKey() {
+		return getTypedKey();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void setKey(TestElement key) {
+		setTypedKey(key);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement getValue() {
+		return getTypedValue();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement setValue(TestElement value) {
+		TestElement oldValue = getValue();
+		setTypedValue(value);
+		return oldValue;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@SuppressWarnings("unchecked")
+	public EMap<TestElement, TestElement> getEMap() {
+		EObject container = eContainer();
+		return container == null ? null : (EMap<TestElement, TestElement>) container.eGet(eContainmentFeature());
+	}
+
+} // TestElementToTestElementMapImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java
index f88637b..3164a4d 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestTypeImpl.java
@@ -24,15 +24,14 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TestTypeImpl#getName <em>Name</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class TestTypeImpl extends EObjectImpl implements TestType
-{
+public class TestTypeImpl extends EObjectImpl implements TestType {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
@@ -61,8 +60,7 @@
 	 * 
 	 * @generated
 	 */
-	protected TestTypeImpl()
-	{
+	protected TestTypeImpl() {
 		super();
 	}
 
@@ -73,8 +71,7 @@
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return TestmodelPackage.Literals.TEST_TYPE;
 	}
 
@@ -84,8 +81,7 @@
 	 * 
 	 * @generated
 	 */
-	public String getName()
-	{
+	public String getName() {
 		return name;
 	}
 
@@ -95,8 +91,7 @@
 	 * 
 	 * @generated
 	 */
-	public void setName(String newName)
-	{
+	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
 		if (eNotificationRequired())
@@ -110,10 +105,8 @@
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case TestmodelPackage.TEST_TYPE__NAME:
 			return getName();
 		}
@@ -127,10 +120,8 @@
 	 * @generated
 	 */
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case TestmodelPackage.TEST_TYPE__NAME:
 			setName((String) newValue);
 			return;
@@ -145,10 +136,8 @@
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case TestmodelPackage.TEST_TYPE__NAME:
 			setName(NAME_EDEFAULT);
 			return;
@@ -163,10 +152,8 @@
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case TestmodelPackage.TEST_TYPE__NAME:
 			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
 		}
@@ -180,8 +167,7 @@
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		if (eIsProxy())
 			return super.toString();
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java
index a229d66..a0b5aa8 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelFactoryImpl.java
@@ -1,214 +1,207 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.impl.EFactoryImpl;

-import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestType;

-import org.eclipse.emf.emfstore.test.model.TestmodelFactory;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Factory</b>.

- * <!-- end-user-doc -->

- * 

- * @generated

- */

-public class TestmodelFactoryImpl extends EFactoryImpl implements TestmodelFactory {

-	/**

-	 * Creates the default factory implementation.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public static TestmodelFactory init() {

-		try

-		{

-			TestmodelFactory theTestmodelFactory = (TestmodelFactory) EPackage.Registry.INSTANCE

-				.getEFactory(TestmodelPackage.eNS_URI);

-			if (theTestmodelFactory != null)

-			{

-				return theTestmodelFactory;

-			}

-		} catch (Exception exception)

-		{

-			EcorePlugin.INSTANCE.log(exception);

-		}

-		return new TestmodelFactoryImpl();

-	}

-

-	/**

-	 * Creates an instance of the factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestmodelFactoryImpl() {

-		super();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	@Override

-	public EObject create(EClass eClass) {

-		switch (eClass.getClassifierID())

-		{

-		case TestmodelPackage.TEST_ELEMENT:

-			return createTestElement();

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP:

-			return (EObject) createTestElementToStringMap();

-		case TestmodelPackage.STRING_TO_STRING_MAP:

-			return (EObject) createStringToStringMap();

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP:

-			return (EObject) createTestElementToTestElementMap();

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP:

-			return (EObject) createStringToTestElementMap();

-		case TestmodelPackage.TEST_TYPE:

-			return createTestType();

-		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT:

-			return createTypeWithFeatureMapNonContainment();

-		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT:

-			return createTypeWithFeatureMapContainment();

-		default:

-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$

-		}

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestElement createTestElement() {

-		TestElementImpl testElement = new TestElementImpl();

-		return testElement;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Map.Entry<TestElement, String> createTestElementToStringMap() {

-		TestElementToStringMapImpl testElementToStringMap = new TestElementToStringMapImpl();

-		return testElementToStringMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Map.Entry<String, String> createStringToStringMap() {

-		StringToStringMapImpl stringToStringMap = new StringToStringMapImpl();

-		return stringToStringMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Map.Entry<TestElement, TestElement> createTestElementToTestElementMap() {

-		TestElementToTestElementMapImpl testElementToTestElementMap = new TestElementToTestElementMapImpl();

-		return testElementToTestElementMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public Map.Entry<String, TestElement> createStringToTestElementMap() {

-		StringToTestElementMapImpl stringToTestElementMap = new StringToTestElementMapImpl();

-		return stringToTestElementMap;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestType createTestType()

-	{

-		TestTypeImpl testType = new TestTypeImpl();

-		return testType;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment()

-	{

-		TypeWithFeatureMapNonContainmentImpl typeWithFeatureMapNonContainment = new TypeWithFeatureMapNonContainmentImpl();

-		return typeWithFeatureMapNonContainment;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TypeWithFeatureMapContainment createTypeWithFeatureMapContainment()

-	{

-		TypeWithFeatureMapContainmentImpl typeWithFeatureMapContainment = new TypeWithFeatureMapContainmentImpl();

-		return typeWithFeatureMapContainment;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestmodelPackage getTestmodelPackage() {

-		return (TestmodelPackage) getEPackage();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @deprecated

-	 * @generated

-	 */

-	@Deprecated

-	public static TestmodelPackage getPackage() {

-		return TestmodelPackage.eINSTANCE;

-	}

-

-} // TestmodelFactoryImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.impl.EFactoryImpl;
+import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Factory</b>.
+ * <!-- end-user-doc -->
+ * 
+ * @generated
+ */
+public class TestmodelFactoryImpl extends EFactoryImpl implements TestmodelFactory {
+	/**
+	 * Creates the default factory implementation.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public static TestmodelFactory init() {
+		try {
+			TestmodelFactory theTestmodelFactory = (TestmodelFactory) EPackage.Registry.INSTANCE
+				.getEFactory(TestmodelPackage.eNS_URI);
+			if (theTestmodelFactory != null) {
+				return theTestmodelFactory;
+			}
+		} catch (Exception exception) {
+			EcorePlugin.INSTANCE.log(exception);
+		}
+		return new TestmodelFactoryImpl();
+	}
+
+	/**
+	 * Creates an instance of the factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestmodelFactoryImpl() {
+		super();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	@Override
+	public EObject create(EClass eClass) {
+		switch (eClass.getClassifierID()) {
+		case TestmodelPackage.TEST_ELEMENT:
+			return createTestElement();
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP:
+			return (EObject) createTestElementToStringMap();
+		case TestmodelPackage.STRING_TO_STRING_MAP:
+			return (EObject) createStringToStringMap();
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP:
+			return (EObject) createTestElementToTestElementMap();
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP:
+			return (EObject) createStringToTestElementMap();
+		case TestmodelPackage.TEST_TYPE:
+			return createTestType();
+		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT:
+			return createTypeWithFeatureMapNonContainment();
+		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT:
+			return createTypeWithFeatureMapContainment();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
+		}
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestElement createTestElement() {
+		TestElementImpl testElement = new TestElementImpl();
+		return testElement;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Map.Entry<TestElement, String> createTestElementToStringMap() {
+		TestElementToStringMapImpl testElementToStringMap = new TestElementToStringMapImpl();
+		return testElementToStringMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Map.Entry<String, String> createStringToStringMap() {
+		StringToStringMapImpl stringToStringMap = new StringToStringMapImpl();
+		return stringToStringMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Map.Entry<TestElement, TestElement> createTestElementToTestElementMap() {
+		TestElementToTestElementMapImpl testElementToTestElementMap = new TestElementToTestElementMapImpl();
+		return testElementToTestElementMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public Map.Entry<String, TestElement> createStringToTestElementMap() {
+		StringToTestElementMapImpl stringToTestElementMap = new StringToTestElementMapImpl();
+		return stringToTestElementMap;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestType createTestType() {
+		TestTypeImpl testType = new TestTypeImpl();
+		return testType;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TypeWithFeatureMapNonContainment createTypeWithFeatureMapNonContainment() {
+		TypeWithFeatureMapNonContainmentImpl typeWithFeatureMapNonContainment = new TypeWithFeatureMapNonContainmentImpl();
+		return typeWithFeatureMapNonContainment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TypeWithFeatureMapContainment createTypeWithFeatureMapContainment() {
+		TypeWithFeatureMapContainmentImpl typeWithFeatureMapContainment = new TypeWithFeatureMapContainmentImpl();
+		return typeWithFeatureMapContainment;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestmodelPackage getTestmodelPackage() {
+		return (TestmodelPackage) getEPackage();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @deprecated
+	 * @generated
+	 */
+	@Deprecated
+	public static TestmodelPackage getPackage() {
+		return TestmodelPackage.eINSTANCE;
+	}
+
+} // TestmodelFactoryImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java
index e696c1f..9f00da2 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TestmodelPackageImpl.java
@@ -1,1061 +1,977 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.impl;

-

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EPackage;

-import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestType;

-import org.eclipse.emf.emfstore.test.model.TestmodelFactory;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;

-

-/**

- * <!-- begin-user-doc -->

- * An implementation of the model <b>Package</b>.

- * <!-- end-user-doc -->

- * 

- * @generated

- */

-public class TestmodelPackageImpl extends EPackageImpl implements TestmodelPackage {

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass testElementEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass testElementToStringMapEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass stringToStringMapEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass testElementToTestElementMapEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass stringToTestElementMapEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass testTypeEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass typeWithFeatureMapNonContainmentEClass = null;

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private EClass typeWithFeatureMapContainmentEClass = null;

-

-	/**

-	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry

-	 * EPackage.Registry} by the package

-	 * package URI value.

-	 * <p>

-	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also

-	 * performs initialization of the package, or returns the registered package, if one already exists. <!--

-	 * begin-user-doc --> <!-- end-user-doc -->

-	 * 

-	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#eNS_URI

-	 * @see #init()

-	 * @generated

-	 */

-	private TestmodelPackageImpl() {

-		super(eNS_URI, TestmodelFactory.eINSTANCE);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private static boolean isInited = false;

-

-	/**

-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

-	 * <p>

-	 * This method is used to initialize {@link TestmodelPackage#eINSTANCE} when that field is accessed. Clients should

-	 * not invoke it directly. Instead, they should simply access that field to obtain the package. <!-- begin-user-doc

-	 * --> <!-- end-user-doc -->

-	 * 

-	 * @see #eNS_URI

-	 * @see #createPackageContents()

-	 * @see #initializePackageContents()

-	 * @generated

-	 */

-	public static TestmodelPackage init() {

-		if (isInited)

-			return (TestmodelPackage) EPackage.Registry.INSTANCE.getEPackage(TestmodelPackage.eNS_URI);

-

-		// Obtain or create and register package

-		TestmodelPackageImpl theTestmodelPackage = (TestmodelPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof TestmodelPackageImpl ? EPackage.Registry.INSTANCE

-			.get(eNS_URI)

-			: new TestmodelPackageImpl());

-

-		isInited = true;

-

-		// Create package meta-data objects

-		theTestmodelPackage.createPackageContents();

-

-		// Initialize created meta-data

-		theTestmodelPackage.initializePackageContents();

-

-		// Mark meta-data to indicate it can't be changed

-		theTestmodelPackage.freeze();

-

-		// Update the registry and return the package

-		EPackage.Registry.INSTANCE.put(TestmodelPackage.eNS_URI, theTestmodelPackage);

-		return theTestmodelPackage;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTestElement() {

-		return testElementEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTestElement_Name() {

-		return (EAttribute) testElementEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTestElement_Strings() {

-		return (EAttribute) testElementEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_References() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ContainedElements() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(3);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_Reference() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(4);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ContainedElement() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(5);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_OtherReference() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(6);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTestElement_Description() {

-		return (EAttribute) testElementEClass.getEStructuralFeatures().get(7);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_Container() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(8);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_SrefContainer() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(9);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ElementMap() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(10);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_StringToStringMap() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(11);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ElementToStringMap() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(12);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_StringToElementMap() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(13);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_NonContained_NTo1() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(14);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_NonContained_1ToN() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(15);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_NonContained_NToM() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(16);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_NonContained_MToN() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(17);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ContainedElements2() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(18);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_Container2() {

-		return (EReference) testElementEClass.getEStructuralFeatures().get(19);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ContainedElements_NoOpposite()

-	{

-		return (EReference) testElementEClass.getEStructuralFeatures().get(20);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_ContainedElement_NoOpposite()

-	{

-		return (EReference) testElementEClass.getEStructuralFeatures().get(21);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTestElement_FeatureMapEntries()

-	{

-		return (EAttribute) testElementEClass.getEStructuralFeatures().get(22);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_FeatureMapReferences1()

-	{

-		return (EReference) testElementEClass.getEStructuralFeatures().get(23);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElement_FeatureMapReferences2()

-	{

-		return (EReference) testElementEClass.getEStructuralFeatures().get(24);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTestElementToStringMap() {

-		return testElementToStringMapEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTestElementToStringMap_Value() {

-		return (EAttribute) testElementToStringMapEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElementToStringMap_Key() {

-		return (EReference) testElementToStringMapEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getStringToStringMap() {

-		return stringToStringMapEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getStringToStringMap_Key() {

-		return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getStringToStringMap_Value() {

-		return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTestElementToTestElementMap() {

-		return testElementToTestElementMapEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElementToTestElementMap_Value() {

-		return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTestElementToTestElementMap_Key() {

-		return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getStringToTestElementMap() {

-		return stringToTestElementMapEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getStringToTestElementMap_Value() {

-		return (EReference) stringToTestElementMapEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getStringToTestElementMap_Key() {

-		return (EAttribute) stringToTestElementMapEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTestType()

-	{

-		return testTypeEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTestType_Name()

-	{

-		return (EAttribute) testTypeEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTypeWithFeatureMapNonContainment()

-	{

-		return typeWithFeatureMapNonContainmentEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTypeWithFeatureMapNonContainment_Map()

-	{

-		return (EAttribute) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTypeWithFeatureMapNonContainment_FirstKey()

-	{

-		return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTypeWithFeatureMapNonContainment_SecondKey()

-	{

-		return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EClass getTypeWithFeatureMapContainment()

-	{

-		return typeWithFeatureMapContainmentEClass;

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EAttribute getTypeWithFeatureMapContainment_MapContainment()

-	{

-		return (EAttribute) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(0);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTypeWithFeatureMapContainment_FirstKeyContainment()

-	{

-		return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(1);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public EReference getTypeWithFeatureMapContainment_SecondKeyContainment()

-	{

-		return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(2);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestmodelFactory getTestmodelFactory() {

-		return (TestmodelFactory) getEFactoryInstance();

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private boolean isCreated = false;

-

-	/**

-	 * Creates the meta-model objects for the package. This method is

-	 * guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void createPackageContents() {

-		if (isCreated)

-			return;

-		isCreated = true;

-

-		// Create classes and their features

-		testElementEClass = createEClass(TEST_ELEMENT);

-		createEAttribute(testElementEClass, TEST_ELEMENT__NAME);

-		createEAttribute(testElementEClass, TEST_ELEMENT__STRINGS);

-		createEReference(testElementEClass, TEST_ELEMENT__REFERENCES);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS);

-		createEReference(testElementEClass, TEST_ELEMENT__REFERENCE);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT);

-		createEReference(testElementEClass, TEST_ELEMENT__OTHER_REFERENCE);

-		createEAttribute(testElementEClass, TEST_ELEMENT__DESCRIPTION);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINER);

-		createEReference(testElementEClass, TEST_ELEMENT__SREF_CONTAINER);

-		createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_MAP);

-		createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_STRING_MAP);

-		createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_TO_STRING_MAP);

-		createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_ELEMENT_MAP);

-		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO1);

-		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_1TO_N);

-		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO_M);

-		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_MTO_N);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS2);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINER2);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);

-		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE);

-		createEAttribute(testElementEClass, TEST_ELEMENT__FEATURE_MAP_ENTRIES);

-		createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES1);

-		createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES2);

-

-		testElementToStringMapEClass = createEClass(TEST_ELEMENT_TO_STRING_MAP);

-		createEAttribute(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__VALUE);

-		createEReference(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__KEY);

-

-		stringToStringMapEClass = createEClass(STRING_TO_STRING_MAP);

-		createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__KEY);

-		createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__VALUE);

-

-		testElementToTestElementMapEClass = createEClass(TEST_ELEMENT_TO_TEST_ELEMENT_MAP);

-		createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE);

-		createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY);

-

-		stringToTestElementMapEClass = createEClass(STRING_TO_TEST_ELEMENT_MAP);

-		createEReference(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__VALUE);

-		createEAttribute(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__KEY);

-

-		testTypeEClass = createEClass(TEST_TYPE);

-		createEAttribute(testTypeEClass, TEST_TYPE__NAME);

-

-		typeWithFeatureMapNonContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT);

-		createEAttribute(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);

-		createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY);

-		createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY);

-

-		typeWithFeatureMapContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_CONTAINMENT);

-		createEAttribute(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);

-		createEReference(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);

-		createEReference(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);

-	}

-

-	/**

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	private boolean isInitialized = false;

-

-	/**

-	 * Complete the initialization of the package and its meta-model. This

-	 * method is guarded to have no affect on any invocation but its first.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public void initializePackageContents() {

-		if (isInitialized)

-			return;

-		isInitialized = true;

-

-		// Initialize package

-		setName(eNAME);

-		setNsPrefix(eNS_PREFIX);

-		setNsURI(eNS_URI);

-

-		// Create type parameters

-

-		// Set bounds for type parameters

-

-		// Add supertypes to classes

-		testElementEClass.getESuperTypes().add(ecorePackage.getEObject());

-		typeWithFeatureMapNonContainmentEClass.getESuperTypes().add(this.getTestType());

-		typeWithFeatureMapContainmentEClass.getESuperTypes().add(this.getTestType());

-

-		// Initialize classes and features; add operations and parameters

-		initEClass(testElementEClass, TestElement.class,

-			"TestElement", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(

-			getTestElement_Name(),

-			ecorePackage.getEString(),

-			"name", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(

-			getTestElement_Strings(),

-			ecorePackage.getEString(),

-			"strings", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_References(),

-			this.getTestElement(),

-			null,

-			"references", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ContainedElements(),

-			this.getTestElement(),

-			this.getTestElement_Container(),

-			"containedElements", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_Reference(),

-			this.getTestElement(),

-			null,

-			"reference", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ContainedElement(),

-			this.getTestElement(),

-			this.getTestElement_SrefContainer(),

-			"containedElement", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_OtherReference(),

-			this.getTestElement(),

-			null,

-			"otherReference", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(

-			getTestElement_Description(),

-			ecorePackage.getEString(),

-			"description", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_Container(),

-			this.getTestElement(),

-			this.getTestElement_ContainedElements(),

-			"container", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_SrefContainer(),

-			this.getTestElement(),

-			this.getTestElement_ContainedElement(),

-			"srefContainer", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ElementMap(),

-			this.getTestElementToTestElementMap(),

-			null,

-			"elementMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_StringToStringMap(),

-			this.getStringToStringMap(),

-			null,

-			"stringToStringMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ElementToStringMap(),

-			this.getTestElementToStringMap(),

-			null,

-			"elementToStringMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_StringToElementMap(),

-			this.getStringToTestElementMap(),

-			null,

-			"stringToElementMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_NonContained_NTo1(),

-			this.getTestElement(),

-			this.getTestElement_NonContained_1ToN(),

-			"nonContained_NTo1", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_NonContained_1ToN(),

-			this.getTestElement(),

-			this.getTestElement_NonContained_NTo1(),

-			"nonContained_1ToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_NonContained_NToM(),

-			this.getTestElement(),

-			this.getTestElement_NonContained_MToN(),

-			"nonContained_NToM", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_NonContained_MToN(),

-			this.getTestElement(),

-			this.getTestElement_NonContained_NToM(),

-			"nonContained_MToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ContainedElements2(),

-			this.getTestElement(),

-			this.getTestElement_Container2(),

-			"containedElements2", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_Container2(),

-			this.getTestElement(),

-			this.getTestElement_ContainedElements2(),

-			"container2", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ContainedElements_NoOpposite(),

-			this.getTestElement(),

-			null,

-			"containedElements_NoOpposite", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_ContainedElement_NoOpposite(),

-			this.getTestElement(),

-			null,

-			"containedElement_NoOpposite", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(

-			getTestElement_FeatureMapEntries(),

-			ecorePackage.getEFeatureMapEntry(),

-			"featureMapEntries", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_FeatureMapReferences1(),

-			this.getTestElement(),

-			null,

-			"featureMapReferences1", null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElement_FeatureMapReferences2(),

-			this.getTestElement(),

-			null,

-			"featureMapReferences2", null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(testElementToStringMapEClass, Map.Entry.class,

-			"TestElementToStringMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(

-			getTestElementToStringMap_Value(),

-			ecorePackage.getEString(),

-			"value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElementToStringMap_Key(),

-			this.getTestElement(),

-			null,

-			"key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(stringToStringMapEClass, Map.Entry.class,

-			"StringToStringMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(

-			getStringToStringMap_Key(),

-			ecorePackage.getEString(),

-			"key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(

-			getStringToStringMap_Value(),

-			ecorePackage.getEString(),

-			"value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(testElementToTestElementMapEClass, Map.Entry.class,

-			"TestElementToTestElementMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(

-			getTestElementToTestElementMap_Value(),

-			this.getTestElement(),

-			null,

-			"value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTestElementToTestElementMap_Key(),

-			this.getTestElement(),

-			null,

-			"key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(stringToTestElementMapEClass, Map.Entry.class,

-			"StringToTestElementMap", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEReference(

-			getStringToTestElementMap_Value(),

-			this.getTestElement(),

-			null,

-			"value", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEAttribute(

-			getStringToTestElementMap_Key(),

-			ecorePackage.getEString(),

-			"key", null, 0, 1, Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(testTypeEClass, TestType.class, "TestType", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(

-			getTestType_Name(),

-			ecorePackage.getEString(),

-			"name", null, 0, 1, TestType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(typeWithFeatureMapNonContainmentEClass, TypeWithFeatureMapNonContainment.class,

-			"TypeWithFeatureMapNonContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(

-			getTypeWithFeatureMapNonContainment_Map(),

-			ecorePackage.getEFeatureMapEntry(),

-			"map", null, 0, -1, TypeWithFeatureMapNonContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTypeWithFeatureMapNonContainment_FirstKey(),

-			this.getTestType(),

-			null,

-			"firstKey", null, 0, -1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTypeWithFeatureMapNonContainment_SecondKey(),

-			this.getTestType(),

-			null,

-			"secondKey", null, 0, -1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		initEClass(typeWithFeatureMapContainmentEClass, TypeWithFeatureMapContainment.class,

-			"TypeWithFeatureMapContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$

-		initEAttribute(

-			getTypeWithFeatureMapContainment_MapContainment(),

-			ecorePackage.getEFeatureMapEntry(),

-			"mapContainment", null, 0, -1, TypeWithFeatureMapContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTypeWithFeatureMapContainment_FirstKeyContainment(),

-			this.getTestType(),

-			null,

-			"firstKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-		initEReference(

-			getTypeWithFeatureMapContainment_SecondKeyContainment(),

-			this.getTestType(),

-			null,

-			"secondKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

-

-		// Create resource

-		createResource(eNS_URI);

-

-		// Create annotations

-		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData

-		createExtendedMetaDataAnnotations();

-	}

-

-	/**

-	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected void createExtendedMetaDataAnnotations()

-	{

-		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$	

-		addAnnotation(getTestElement_FeatureMapEntries(),

-			source,

-			new String[]

-			{ "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTestElement_FeatureMapReferences1(),

-			source,

-			new String[]

-			{ "group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTestElement_FeatureMapReferences2(),

-			source,

-			new String[]

-			{ "group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTypeWithFeatureMapNonContainment_Map(),

-			source,

-			new String[]

-			{ "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTypeWithFeatureMapNonContainment_FirstKey(),

-			source,

-			new String[]

-			{ "group", "#map" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTypeWithFeatureMapNonContainment_SecondKey(),

-			source,

-			new String[]

-			{ "group", "#map" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTypeWithFeatureMapContainment_MapContainment(),

-			source,

-			new String[]

-			{ "kind", "group" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTypeWithFeatureMapContainment_FirstKeyContainment(),

-			source,

-			new String[]

-			{ "group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-		addAnnotation(getTypeWithFeatureMapContainment_SecondKeyContainment(),

-			source,

-			new String[]

-			{ "group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$

-			});

-	}

-

-} // TestmodelPackageImpl

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.impl;
+
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EAttribute;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.impl.EPackageImpl;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelFactory;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model <b>Package</b>.
+ * <!-- end-user-doc -->
+ * 
+ * @generated
+ */
+public class TestmodelPackageImpl extends EPackageImpl implements TestmodelPackage {
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass testElementEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass testElementToStringMapEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass stringToStringMapEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass testElementToTestElementMapEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass stringToTestElementMapEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass testTypeEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass typeWithFeatureMapNonContainmentEClass = null;
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private EClass typeWithFeatureMapContainmentEClass = null;
+
+	/**
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry
+	 * EPackage.Registry} by the package
+	 * package URI value.
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also
+	 * performs initialization of the package, or returns the registered package, if one already exists. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
+	 * @see org.eclipse.emf.ecore.EPackage.Registry
+	 * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage#eNS_URI
+	 * @see #init()
+	 * @generated
+	 */
+	private TestmodelPackageImpl() {
+		super(eNS_URI, TestmodelFactory.eINSTANCE);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private static boolean isInited = false;
+
+	/**
+	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+	 * 
+	 * <p>
+	 * This method is used to initialize {@link TestmodelPackage#eINSTANCE} when that field is accessed.
+	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
+	 * <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
+	 * @see #eNS_URI
+	 * @see #createPackageContents()
+	 * @see #initializePackageContents()
+	 * @generated
+	 */
+	public static TestmodelPackage init() {
+		if (isInited)
+			return (TestmodelPackage) EPackage.Registry.INSTANCE.getEPackage(TestmodelPackage.eNS_URI);
+
+		// Obtain or create and register package
+		TestmodelPackageImpl theTestmodelPackage = (TestmodelPackageImpl) (EPackage.Registry.INSTANCE
+			.get(eNS_URI) instanceof TestmodelPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
+				: new TestmodelPackageImpl());
+
+		isInited = true;
+
+		// Create package meta-data objects
+		theTestmodelPackage.createPackageContents();
+
+		// Initialize created meta-data
+		theTestmodelPackage.initializePackageContents();
+
+		// Mark meta-data to indicate it can't be changed
+		theTestmodelPackage.freeze();
+
+		// Update the registry and return the package
+		EPackage.Registry.INSTANCE.put(TestmodelPackage.eNS_URI, theTestmodelPackage);
+		return theTestmodelPackage;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getTestElement() {
+		return testElementEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTestElement_Name() {
+		return (EAttribute) testElementEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTestElement_Strings() {
+		return (EAttribute) testElementEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_References() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ContainedElements() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(3);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_Reference() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(4);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ContainedElement() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(5);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_OtherReference() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(6);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTestElement_Description() {
+		return (EAttribute) testElementEClass.getEStructuralFeatures().get(7);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_Container() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(8);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_SrefContainer() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(9);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ElementMap() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(10);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_StringToStringMap() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(11);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ElementToStringMap() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(12);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_StringToElementMap() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(13);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_NonContained_NTo1() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(14);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_NonContained_1ToN() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(15);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_NonContained_NToM() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(16);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_NonContained_MToN() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(17);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ContainedElements2() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(18);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_Container2() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(19);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ContainedElements_NoOpposite() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(20);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_ContainedElement_NoOpposite() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(21);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTestElement_FeatureMapEntries() {
+		return (EAttribute) testElementEClass.getEStructuralFeatures().get(22);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_FeatureMapReferences1() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(23);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElement_FeatureMapReferences2() {
+		return (EReference) testElementEClass.getEStructuralFeatures().get(24);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getTestElementToStringMap() {
+		return testElementToStringMapEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTestElementToStringMap_Value() {
+		return (EAttribute) testElementToStringMapEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElementToStringMap_Key() {
+		return (EReference) testElementToStringMapEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getStringToStringMap() {
+		return stringToStringMapEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getStringToStringMap_Key() {
+		return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getStringToStringMap_Value() {
+		return (EAttribute) stringToStringMapEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getTestElementToTestElementMap() {
+		return testElementToTestElementMapEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElementToTestElementMap_Value() {
+		return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTestElementToTestElementMap_Key() {
+		return (EReference) testElementToTestElementMapEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getStringToTestElementMap() {
+		return stringToTestElementMapEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getStringToTestElementMap_Value() {
+		return (EReference) stringToTestElementMapEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getStringToTestElementMap_Key() {
+		return (EAttribute) stringToTestElementMapEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getTestType() {
+		return testTypeEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTestType_Name() {
+		return (EAttribute) testTypeEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getTypeWithFeatureMapNonContainment() {
+		return typeWithFeatureMapNonContainmentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTypeWithFeatureMapNonContainment_Map() {
+		return (EAttribute) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTypeWithFeatureMapNonContainment_FirstKey() {
+		return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTypeWithFeatureMapNonContainment_SecondKey() {
+		return (EReference) typeWithFeatureMapNonContainmentEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EClass getTypeWithFeatureMapContainment() {
+		return typeWithFeatureMapContainmentEClass;
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EAttribute getTypeWithFeatureMapContainment_MapContainment() {
+		return (EAttribute) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(0);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTypeWithFeatureMapContainment_FirstKeyContainment() {
+		return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(1);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public EReference getTypeWithFeatureMapContainment_SecondKeyContainment() {
+		return (EReference) typeWithFeatureMapContainmentEClass.getEStructuralFeatures().get(2);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestmodelFactory getTestmodelFactory() {
+		return (TestmodelFactory) getEFactoryInstance();
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private boolean isCreated = false;
+
+	/**
+	 * Creates the meta-model objects for the package. This method is
+	 * guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void createPackageContents() {
+		if (isCreated)
+			return;
+		isCreated = true;
+
+		// Create classes and their features
+		testElementEClass = createEClass(TEST_ELEMENT);
+		createEAttribute(testElementEClass, TEST_ELEMENT__NAME);
+		createEAttribute(testElementEClass, TEST_ELEMENT__STRINGS);
+		createEReference(testElementEClass, TEST_ELEMENT__REFERENCES);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS);
+		createEReference(testElementEClass, TEST_ELEMENT__REFERENCE);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT);
+		createEReference(testElementEClass, TEST_ELEMENT__OTHER_REFERENCE);
+		createEAttribute(testElementEClass, TEST_ELEMENT__DESCRIPTION);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINER);
+		createEReference(testElementEClass, TEST_ELEMENT__SREF_CONTAINER);
+		createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_MAP);
+		createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_STRING_MAP);
+		createEReference(testElementEClass, TEST_ELEMENT__ELEMENT_TO_STRING_MAP);
+		createEReference(testElementEClass, TEST_ELEMENT__STRING_TO_ELEMENT_MAP);
+		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO1);
+		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_1TO_N);
+		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_NTO_M);
+		createEReference(testElementEClass, TEST_ELEMENT__NON_CONTAINED_MTO_N);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS2);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINER2);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENTS_NO_OPPOSITE);
+		createEReference(testElementEClass, TEST_ELEMENT__CONTAINED_ELEMENT_NO_OPPOSITE);
+		createEAttribute(testElementEClass, TEST_ELEMENT__FEATURE_MAP_ENTRIES);
+		createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES1);
+		createEReference(testElementEClass, TEST_ELEMENT__FEATURE_MAP_REFERENCES2);
+
+		testElementToStringMapEClass = createEClass(TEST_ELEMENT_TO_STRING_MAP);
+		createEAttribute(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__VALUE);
+		createEReference(testElementToStringMapEClass, TEST_ELEMENT_TO_STRING_MAP__KEY);
+
+		stringToStringMapEClass = createEClass(STRING_TO_STRING_MAP);
+		createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__KEY);
+		createEAttribute(stringToStringMapEClass, STRING_TO_STRING_MAP__VALUE);
+
+		testElementToTestElementMapEClass = createEClass(TEST_ELEMENT_TO_TEST_ELEMENT_MAP);
+		createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__VALUE);
+		createEReference(testElementToTestElementMapEClass, TEST_ELEMENT_TO_TEST_ELEMENT_MAP__KEY);
+
+		stringToTestElementMapEClass = createEClass(STRING_TO_TEST_ELEMENT_MAP);
+		createEReference(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__VALUE);
+		createEAttribute(stringToTestElementMapEClass, STRING_TO_TEST_ELEMENT_MAP__KEY);
+
+		testTypeEClass = createEClass(TEST_TYPE);
+		createEAttribute(testTypeEClass, TEST_TYPE__NAME);
+
+		typeWithFeatureMapNonContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT);
+		createEAttribute(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
+		createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY);
+		createEReference(typeWithFeatureMapNonContainmentEClass, TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY);
+
+		typeWithFeatureMapContainmentEClass = createEClass(TYPE_WITH_FEATURE_MAP_CONTAINMENT);
+		createEAttribute(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
+		createEReference(typeWithFeatureMapContainmentEClass, TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
+		createEReference(typeWithFeatureMapContainmentEClass,
+			TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
+	}
+
+	/**
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	private boolean isInitialized = false;
+
+	/**
+	 * Complete the initialization of the package and its meta-model. This
+	 * method is guarded to have no affect on any invocation but its first.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public void initializePackageContents() {
+		if (isInitialized)
+			return;
+		isInitialized = true;
+
+		// Initialize package
+		setName(eNAME);
+		setNsPrefix(eNS_PREFIX);
+		setNsURI(eNS_URI);
+
+		// Create type parameters
+
+		// Set bounds for type parameters
+
+		// Add supertypes to classes
+		testElementEClass.getESuperTypes().add(ecorePackage.getEObject());
+		typeWithFeatureMapNonContainmentEClass.getESuperTypes().add(this.getTestType());
+		typeWithFeatureMapContainmentEClass.getESuperTypes().add(this.getTestType());
+
+		// Initialize classes and features; add operations and parameters
+		initEClass(testElementEClass, TestElement.class, "TestElement", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTestElement_Name(), ecorePackage.getEString(), "name", null, 0, 1, TestElement.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestElement_Strings(), ecorePackage.getEString(), "strings", null, 0, -1, TestElement.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_References(), this.getTestElement(), null, "references", null, 0, -1, //$NON-NLS-1$
+			TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_ContainedElements(), this.getTestElement(), this.getTestElement_Container(),
+			"containedElements", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_Reference(), this.getTestElement(), null, "reference", null, 0, 1, //$NON-NLS-1$
+			TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_ContainedElement(), this.getTestElement(), this.getTestElement_SrefContainer(),
+			"containedElement", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, //$NON-NLS-1$
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_OtherReference(), this.getTestElement(), null, "otherReference", null, 0, 1, //$NON-NLS-1$
+			TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestElement_Description(), ecorePackage.getEString(), "description", null, 0, 1, //$NON-NLS-1$
+			TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_Container(), this.getTestElement(), this.getTestElement_ContainedElements(),
+			"container", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_SrefContainer(), this.getTestElement(), this.getTestElement_ContainedElement(),
+			"srefContainer", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_ElementMap(), this.getTestElementToTestElementMap(), null, "elementMap", null, 0, //$NON-NLS-1$
+			-1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_StringToStringMap(), this.getStringToStringMap(), null, "stringToStringMap", null, //$NON-NLS-1$
+			0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_ElementToStringMap(), this.getTestElementToStringMap(), null,
+			"elementToStringMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_StringToElementMap(), this.getStringToTestElementMap(), null,
+			"stringToElementMap", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_NonContained_NTo1(), this.getTestElement(),
+			this.getTestElement_NonContained_1ToN(), "nonContained_NTo1", null, 0, 1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getTestElement_NonContained_1ToN(), this.getTestElement(),
+			this.getTestElement_NonContained_NTo1(), "nonContained_1ToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getTestElement_NonContained_NToM(), this.getTestElement(),
+			this.getTestElement_NonContained_MToN(), "nonContained_NToM", null, 0, -1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getTestElement_NonContained_MToN(), this.getTestElement(),
+			this.getTestElement_NonContained_NToM(), "nonContained_MToN", null, 0, -1, TestElement.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getTestElement_ContainedElements2(), this.getTestElement(), this.getTestElement_Container2(),
+			"containedElements2", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_Container2(), this.getTestElement(), this.getTestElement_ContainedElements2(),
+			"container2", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, //$NON-NLS-1$
+			!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_ContainedElements_NoOpposite(), this.getTestElement(), null,
+			"containedElements_NoOpposite", null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_ContainedElement_NoOpposite(), this.getTestElement(), null,
+			"containedElement_NoOpposite", null, 0, 1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, //$NON-NLS-1$
+			IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getTestElement_FeatureMapEntries(), ecorePackage.getEFeatureMapEntry(), "featureMapEntries", //$NON-NLS-1$
+			null, 0, -1, TestElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
+			IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_FeatureMapReferences1(), this.getTestElement(), null, "featureMapReferences1", //$NON-NLS-1$
+			null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElement_FeatureMapReferences2(), this.getTestElement(), null, "featureMapReferences2", //$NON-NLS-1$
+			null, 0, -1, TestElement.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+		initEClass(testElementToStringMapEClass, Map.Entry.class, "TestElementToStringMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTestElementToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, //$NON-NLS-1$
+			Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
+			IS_ORDERED);
+		initEReference(getTestElementToStringMap_Key(), this.getTestElement(), null, "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
+			!IS_DERIVED, IS_ORDERED);
+
+		initEClass(stringToStringMapEClass, Map.Entry.class, "StringToStringMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getStringToStringMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getStringToStringMap_Value(), ecorePackage.getEString(), "value", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(testElementToTestElementMapEClass, Map.Entry.class, "TestElementToTestElementMap", !IS_ABSTRACT, //$NON-NLS-1$
+			!IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getTestElementToTestElementMap_Value(), this.getTestElement(), null, "value", null, 0, 1, //$NON-NLS-1$
+			Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTestElementToTestElementMap_Key(), this.getTestElement(), null, "key", null, 0, 1, //$NON-NLS-1$
+			Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(stringToTestElementMapEClass, Map.Entry.class, "StringToTestElementMap", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			!IS_GENERATED_INSTANCE_CLASS);
+		initEReference(getStringToTestElementMap_Value(), this.getTestElement(), null, "value", null, 0, 1, //$NON-NLS-1$
+			Map.Entry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+			!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEAttribute(getStringToTestElementMap_Key(), ecorePackage.getEString(), "key", null, 0, 1, Map.Entry.class, //$NON-NLS-1$
+			!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(testTypeEClass, TestType.class, "TestType", !IS_ABSTRACT, !IS_INTERFACE, //$NON-NLS-1$
+			IS_GENERATED_INSTANCE_CLASS);
+		initEAttribute(getTestType_Name(), ecorePackage.getEString(), "name", null, 0, 1, TestType.class, !IS_TRANSIENT, //$NON-NLS-1$
+			!IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		initEClass(typeWithFeatureMapNonContainmentEClass, TypeWithFeatureMapNonContainment.class,
+			"TypeWithFeatureMapNonContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTypeWithFeatureMapNonContainment_Map(), ecorePackage.getEFeatureMapEntry(), "map", null, 0, //$NON-NLS-1$
+			-1, TypeWithFeatureMapNonContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
+			!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTypeWithFeatureMapNonContainment_FirstKey(), this.getTestType(), null, "firstKey", null, 0, //$NON-NLS-1$
+			-1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+		initEReference(getTypeWithFeatureMapNonContainment_SecondKey(), this.getTestType(), null, "secondKey", null, 0, //$NON-NLS-1$
+			-1, TypeWithFeatureMapNonContainment.class, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
+			IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
+
+		initEClass(typeWithFeatureMapContainmentEClass, TypeWithFeatureMapContainment.class,
+			"TypeWithFeatureMapContainment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
+		initEAttribute(getTypeWithFeatureMapContainment_MapContainment(), ecorePackage.getEFeatureMapEntry(),
+			"mapContainment", null, 0, -1, TypeWithFeatureMapContainment.class, !IS_TRANSIENT, !IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTypeWithFeatureMapContainment_FirstKeyContainment(), this.getTestType(), null,
+			"firstKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+		initEReference(getTypeWithFeatureMapContainment_SecondKeyContainment(), this.getTestType(), null,
+			"secondKeyContainment", null, 0, -1, TypeWithFeatureMapContainment.class, IS_TRANSIENT, IS_VOLATILE, //$NON-NLS-1$
+			IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
+		// Create resource
+		createResource(eNS_URI);
+
+		// Create annotations
+		// http:///org/eclipse/emf/ecore/util/ExtendedMetaData
+		createExtendedMetaDataAnnotations();
+	}
+
+	/**
+	 * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected void createExtendedMetaDataAnnotations() {
+		String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData"; //$NON-NLS-1$
+		addAnnotation(getTestElement_FeatureMapEntries(),
+			source,
+			new String[] {
+				"kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTestElement_FeatureMapReferences1(),
+			source,
+			new String[] {
+				"group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTestElement_FeatureMapReferences2(),
+			source,
+			new String[] {
+				"group", "#featureMapEntries" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTypeWithFeatureMapNonContainment_Map(),
+			source,
+			new String[] {
+				"kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTypeWithFeatureMapNonContainment_FirstKey(),
+			source,
+			new String[] {
+				"group", "#map" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTypeWithFeatureMapNonContainment_SecondKey(),
+			source,
+			new String[] {
+				"group", "#map" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTypeWithFeatureMapContainment_MapContainment(),
+			source,
+			new String[] {
+				"kind", "group" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTypeWithFeatureMapContainment_FirstKeyContainment(),
+			source,
+			new String[] {
+				"group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+		addAnnotation(getTypeWithFeatureMapContainment_SecondKeyContainment(),
+			source,
+			new String[] {
+				"group", "#mapContainment" //$NON-NLS-1$ //$NON-NLS-2$
+			});
+	}
+
+} // TestmodelPackageImpl
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java
index add6cb4..7d60a3a 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapContainmentImpl.java
@@ -30,20 +30,19 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getMapContainment <em>Map
- * Containment</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getFirstKeyContainment <em>
- * First Key Containment</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getSecondKeyContainment <em>
- * Second Key Containment</em>}</li>
- * </ul>
  * </p>
+ * <ul>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getMapContainment
+ * <em>Map Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getFirstKeyContainment
+ * <em>First Key Containment</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapContainmentImpl#getSecondKeyContainment
+ * <em>Second Key Containment</em>}</li>
+ * </ul>
  *
  * @generated
  */
-public class TypeWithFeatureMapContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapContainment
-{
+public class TypeWithFeatureMapContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapContainment {
 	/**
 	 * The cached value of the '{@link #getMapContainment() <em>Map Containment</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -61,8 +60,7 @@
 	 * 
 	 * @generated
 	 */
-	protected TypeWithFeatureMapContainmentImpl()
-	{
+	protected TypeWithFeatureMapContainmentImpl() {
 		super();
 	}
 
@@ -73,8 +71,7 @@
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT;
 	}
 
@@ -84,10 +81,8 @@
 	 * 
 	 * @generated
 	 */
-	public FeatureMap getMapContainment()
-	{
-		if (mapContainment == null)
-		{
+	public FeatureMap getMapContainment() {
+		if (mapContainment == null) {
 			mapContainment = new BasicFeatureMap(this,
 				TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT);
 		}
@@ -100,10 +95,9 @@
 	 * 
 	 * @generated
 	 */
-	public EList<TestType> getFirstKeyContainment()
-	{
-		return getMapContainment().list(
-			TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
+	public EList<TestType> getFirstKeyContainment() {
+		return getMapContainment()
+			.list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT);
 	}
 
 	/**
@@ -112,10 +106,9 @@
 	 * 
 	 * @generated
 	 */
-	public EList<TestType> getSecondKeyContainment()
-	{
-		return getMapContainment().list(
-			TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
+	public EList<TestType> getSecondKeyContainment() {
+		return getMapContainment()
+			.list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_CONTAINMENT__SECOND_KEY_CONTAINMENT);
 	}
 
 	/**
@@ -125,10 +118,8 @@
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
 			return ((InternalEList<?>) getMapContainment()).basicRemove(otherEnd, msgs);
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT:
@@ -146,10 +137,8 @@
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
 			if (coreType)
 				return getMapContainment();
@@ -170,10 +159,8 @@
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
 			((FeatureMap.Internal) getMapContainment()).set(newValue);
 			return;
@@ -196,10 +183,8 @@
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
 			getMapContainment().clear();
 			return;
@@ -220,10 +205,8 @@
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__MAP_CONTAINMENT:
 			return mapContainment != null && !mapContainment.isEmpty();
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT__FIRST_KEY_CONTAINMENT:
@@ -241,8 +224,7 @@
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		if (eIsProxy())
 			return super.toString();
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java
index f539e2c..2f86b6b 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/impl/TypeWithFeatureMapNonContainmentImpl.java
@@ -30,19 +30,18 @@
  * <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
+ * </p>
  * <ul>
  * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getMap <em>Map</em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getFirstKey <em>First Key
- * </em>}</li>
- * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getSecondKey <em>Second Key
- * </em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getFirstKey
+ * <em>First Key</em>}</li>
+ * <li>{@link org.eclipse.emf.emfstore.test.model.impl.TypeWithFeatureMapNonContainmentImpl#getSecondKey
+ * <em>Second Key</em>}</li>
  * </ul>
- * </p>
  *
  * @generated
  */
-public class TypeWithFeatureMapNonContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapNonContainment
-{
+public class TypeWithFeatureMapNonContainmentImpl extends TestTypeImpl implements TypeWithFeatureMapNonContainment {
 	/**
 	 * The cached value of the '{@link #getMap() <em>Map</em>}' attribute list.
 	 * <!-- begin-user-doc -->
@@ -60,8 +59,7 @@
 	 * 
 	 * @generated
 	 */
-	protected TypeWithFeatureMapNonContainmentImpl()
-	{
+	protected TypeWithFeatureMapNonContainmentImpl() {
 		super();
 	}
 
@@ -72,8 +70,7 @@
 	 * @generated
 	 */
 	@Override
-	protected EClass eStaticClass()
-	{
+	protected EClass eStaticClass() {
 		return TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT;
 	}
 
@@ -83,10 +80,8 @@
 	 * 
 	 * @generated
 	 */
-	public FeatureMap getMap()
-	{
-		if (map == null)
-		{
+	public FeatureMap getMap() {
+		if (map == null) {
 			map = new BasicFeatureMap(this, TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP);
 		}
 		return map;
@@ -98,8 +93,7 @@
 	 * 
 	 * @generated
 	 */
-	public EList<TestType> getFirstKey()
-	{
+	public EList<TestType> getFirstKey() {
 		return getMap().list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY);
 	}
 
@@ -109,8 +103,7 @@
 	 * 
 	 * @generated
 	 */
-	public EList<TestType> getSecondKey()
-	{
+	public EList<TestType> getSecondKey() {
 		return getMap().list(TestmodelPackage.Literals.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__SECOND_KEY);
 	}
 
@@ -121,10 +114,8 @@
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-	{
-		switch (featureID)
-		{
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
 			return ((InternalEList<?>) getMap()).basicRemove(otherEnd, msgs);
 		}
@@ -138,10 +129,8 @@
 	 * @generated
 	 */
 	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType)
-	{
-		switch (featureID)
-		{
+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
 			if (coreType)
 				return getMap();
@@ -162,10 +151,8 @@
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public void eSet(int featureID, Object newValue)
-	{
-		switch (featureID)
-		{
+	public void eSet(int featureID, Object newValue) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
 			((FeatureMap.Internal) getMap()).set(newValue);
 			return;
@@ -188,10 +175,8 @@
 	 * @generated
 	 */
 	@Override
-	public void eUnset(int featureID)
-	{
-		switch (featureID)
-		{
+	public void eUnset(int featureID) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
 			getMap().clear();
 			return;
@@ -212,10 +197,8 @@
 	 * @generated
 	 */
 	@Override
-	public boolean eIsSet(int featureID)
-	{
-		switch (featureID)
-		{
+	public boolean eIsSet(int featureID) {
+		switch (featureID) {
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__MAP:
 			return map != null && !map.isEmpty();
 		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT__FIRST_KEY:
@@ -233,8 +216,7 @@
 	 * @generated
 	 */
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		if (eIsProxy())
 			return super.toString();
 
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java
index e1c778d..dbe452c 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelAdapterFactory.java
@@ -1,304 +1,287 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.util;

-

-import java.util.Map;

-

-import org.eclipse.emf.common.notify.Adapter;

-import org.eclipse.emf.common.notify.Notifier;

-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestType;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Adapter Factory</b> for the model.

- * It provides an adapter <code>createXXX</code> method for each class of the model.

- * <!-- end-user-doc -->

- * 

- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage

- * @generated

- */

-public class TestmodelAdapterFactory extends AdapterFactoryImpl {

-	/**

-	 * The cached model package.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected static TestmodelPackage modelPackage;

-

-	/**

-	 * Creates an instance of the adapter factory.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestmodelAdapterFactory() {

-		if (modelPackage == null)

-		{

-			modelPackage = TestmodelPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Returns whether this factory is applicable for the type of the object.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance

-	 * object of the model.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return whether this factory is applicable for the type of the object.

-	 * @generated

-	 */

-	@Override

-	public boolean isFactoryForType(Object object) {

-		if (object == modelPackage)

-		{

-			return true;

-		}

-		if (object instanceof EObject)

-		{

-			return ((EObject) object).eClass().getEPackage() == modelPackage;

-		}

-		return false;

-	}

-

-	/**

-	 * The switch that delegates to the <code>createXXX</code> methods.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected TestmodelSwitch<Adapter> modelSwitch =

-		new TestmodelSwitch<Adapter>()

-		{

-			@Override

-			public Adapter caseTestElement(TestElement object)

-			{

-				return createTestElementAdapter();

-			}

-

-			@Override

-			public Adapter caseTestElementToStringMap(Map.Entry<TestElement, String> object)

-			{

-				return createTestElementToStringMapAdapter();

-			}

-

-			@Override

-			public Adapter caseStringToStringMap(Map.Entry<String, String> object)

-			{

-				return createStringToStringMapAdapter();

-			}

-

-			@Override

-			public Adapter caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object)

-			{

-				return createTestElementToTestElementMapAdapter();

-			}

-

-			@Override

-			public Adapter caseStringToTestElementMap(Map.Entry<String, TestElement> object)

-			{

-				return createStringToTestElementMapAdapter();

-			}

-

-			@Override

-			public Adapter caseTestType(TestType object)

-			{

-				return createTestTypeAdapter();

-			}

-

-			@Override

-			public Adapter caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object)

-			{

-				return createTypeWithFeatureMapNonContainmentAdapter();

-			}

-

-			@Override

-			public Adapter caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object)

-			{

-				return createTypeWithFeatureMapContainmentAdapter();

-			}

-

-			@Override

-			public Adapter defaultCase(EObject object)

-			{

-				return createEObjectAdapter();

-			}

-		};

-

-	/**

-	 * Creates an adapter for the <code>target</code>.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param target the object to adapt.

-	 * @return the adapter for the <code>target</code>.

-	 * @generated

-	 */

-	@Override

-	public Adapter createAdapter(Notifier target) {

-		return modelSwitch.doSwitch((EObject) target);

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestElement

-	 * <em>Test Element</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.emfstore.test.model.TestElement

-	 * @generated

-	 */

-	public Adapter createTestElementAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see java.util.Map.Entry

-	 * @generated

-	 */

-	public Adapter createTestElementToStringMapAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see java.util.Map.Entry

-	 * @generated

-	 */

-	public Adapter createStringToStringMapAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry

-	 * <em>Test Element To Test Element Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see java.util.Map.Entry

-	 * @generated

-	 */

-	public Adapter createTestElementToTestElementMapAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see java.util.Map.Entry

-	 * @generated

-	 */

-	public Adapter createStringToTestElementMapAdapter() {

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestType

-	 * <em>Test Type</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.emfstore.test.model.TestType

-	 * @generated

-	 */

-	public Adapter createTestTypeAdapter()

-	{

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment

-	 * <em>Type With Feature Map Non Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment

-	 * @generated

-	 */

-	public Adapter createTypeWithFeatureMapNonContainmentAdapter()

-	{

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for an object of class '

-	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment

-	 * <em>Type With Feature Map Containment</em>}'.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null so that we can easily ignore cases;

-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment

-	 * @generated

-	 */

-	public Adapter createTypeWithFeatureMapContainmentAdapter()

-	{

-		return null;

-	}

-

-	/**

-	 * Creates a new adapter for the default case.

-	 * <!-- begin-user-doc -->

-	 * This default implementation returns null.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the new adapter.

-	 * @generated

-	 */

-	public Adapter createEObjectAdapter() {

-		return null;

-	}

-

-} // TestmodelAdapterFactory

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.util;
+
+import java.util.Map;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Adapter Factory</b> for the model.
+ * It provides an adapter <code>createXXX</code> method for each class of the model.
+ * <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
+ * @generated
+ */
+public class TestmodelAdapterFactory extends AdapterFactoryImpl {
+	/**
+	 * The cached model package.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected static TestmodelPackage modelPackage;
+
+	/**
+	 * Creates an instance of the adapter factory.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestmodelAdapterFactory() {
+		if (modelPackage == null) {
+			modelPackage = TestmodelPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Returns whether this factory is applicable for the type of the object.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance
+	 * object of the model.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return whether this factory is applicable for the type of the object.
+	 * @generated
+	 */
+	@Override
+	public boolean isFactoryForType(Object object) {
+		if (object == modelPackage) {
+			return true;
+		}
+		if (object instanceof EObject) {
+			return ((EObject) object).eClass().getEPackage() == modelPackage;
+		}
+		return false;
+	}
+
+	/**
+	 * The switch that delegates to the <code>createXXX</code> methods.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected TestmodelSwitch<Adapter> modelSwitch = new TestmodelSwitch<Adapter>() {
+		@Override
+		public Adapter caseTestElement(TestElement object) {
+			return createTestElementAdapter();
+		}
+
+		@Override
+		public Adapter caseTestElementToStringMap(Map.Entry<TestElement, String> object) {
+			return createTestElementToStringMapAdapter();
+		}
+
+		@Override
+		public Adapter caseStringToStringMap(Map.Entry<String, String> object) {
+			return createStringToStringMapAdapter();
+		}
+
+		@Override
+		public Adapter caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object) {
+			return createTestElementToTestElementMapAdapter();
+		}
+
+		@Override
+		public Adapter caseStringToTestElementMap(Map.Entry<String, TestElement> object) {
+			return createStringToTestElementMapAdapter();
+		}
+
+		@Override
+		public Adapter caseTestType(TestType object) {
+			return createTestTypeAdapter();
+		}
+
+		@Override
+		public Adapter caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object) {
+			return createTypeWithFeatureMapNonContainmentAdapter();
+		}
+
+		@Override
+		public Adapter caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object) {
+			return createTypeWithFeatureMapContainmentAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
+
+	/**
+	 * Creates an adapter for the <code>target</code>.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param target the object to adapt.
+	 * @return the adapter for the <code>target</code>.
+	 * @generated
+	 */
+	@Override
+	public Adapter createAdapter(Notifier target) {
+		return modelSwitch.doSwitch((EObject) target);
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestElement
+	 * <em>Test Element</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.emfstore.test.model.TestElement
+	 * @generated
+	 */
+	public Adapter createTestElementAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>Test Element To String Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see java.util.Map.Entry
+	 * @generated
+	 */
+	public Adapter createTestElementToStringMapAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To String Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see java.util.Map.Entry
+	 * @generated
+	 */
+	public Adapter createStringToStringMapAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry
+	 * <em>Test Element To Test Element Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see java.util.Map.Entry
+	 * @generated
+	 */
+	public Adapter createTestElementToTestElementMapAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link java.util.Map.Entry <em>String To Test Element Map</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see java.util.Map.Entry
+	 * @generated
+	 */
+	public Adapter createStringToTestElementMapAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.emfstore.test.model.TestType
+	 * <em>Test Type</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.emfstore.test.model.TestType
+	 * @generated
+	 */
+	public Adapter createTestTypeAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+	 * <em>Type With Feature Map Non Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment
+	 * @generated
+	 */
+	public Adapter createTypeWithFeatureMapNonContainmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for an object of class '
+	 * {@link org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+	 * <em>Type With Feature Map Containment</em>}'.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null so that we can easily ignore cases;
+	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @see org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment
+	 * @generated
+	 */
+	public Adapter createTypeWithFeatureMapContainmentAdapter() {
+		return null;
+	}
+
+	/**
+	 * Creates a new adapter for the default case.
+	 * <!-- begin-user-doc -->
+	 * This default implementation returns null.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the new adapter.
+	 * @generated
+	 */
+	public Adapter createEObjectAdapter() {
+		return null;
+	}
+
+} // TestmodelAdapterFactory
diff --git a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java
index f129cf7..27bf7b3 100644
--- a/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java
+++ b/tests/org.eclipse.emf.emfstore.test.model/src/org/eclipse/emf/emfstore/test/model/util/TestmodelSwitch.java
@@ -1,324 +1,316 @@
-/**

- * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.

- * 

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- * Edgar Mueller - initial API and implementation

- */

-package org.eclipse.emf.emfstore.test.model.util;

-

-import java.util.List;

-import java.util.Map;

-

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.emfstore.test.model.TestElement;

-import org.eclipse.emf.emfstore.test.model.TestType;

-import org.eclipse.emf.emfstore.test.model.TestmodelPackage;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;

-import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;

-

-/**

- * <!-- begin-user-doc -->

- * The <b>Switch</b> for the model's inheritance hierarchy.

- * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each

- * class of the model,

- * starting with the actual class of the object

- * and proceeding up the inheritance hierarchy

- * until a non-null result is returned,

- * which is the result of the switch.

- * <!-- end-user-doc -->

- * 

- * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage

- * @generated

- */

-public class TestmodelSwitch<T> {

-	/**

-	 * The cached model package

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	protected static TestmodelPackage modelPackage;

-

-	/**

-	 * Creates an instance of the switch.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @generated

-	 */

-	public TestmodelSwitch() {

-		if (modelPackage == null)

-		{

-			modelPackage = TestmodelPackage.eINSTANCE;

-		}

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that

-	 * result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	public T doSwitch(EObject theEObject) {

-		return doSwitch(theEObject.eClass(), theEObject);

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that

-	 * result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	protected T doSwitch(EClass theEClass, EObject theEObject) {

-		if (theEClass.eContainer() == modelPackage)

-		{

-			return doSwitch(theEClass.getClassifierID(), theEObject);

-		}

-		List<EClass> eSuperTypes = theEClass.getESuperTypes();

-		return eSuperTypes.isEmpty() ?

-			defaultCase(theEObject) :

-			doSwitch(eSuperTypes.get(0), theEObject);

-	}

-

-	/**

-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that

-	 * result.

-	 * <!-- begin-user-doc -->

-	 * <!-- end-user-doc -->

-	 * 

-	 * @return the first non-null result returned by a <code>caseXXX</code> call.

-	 * @generated

-	 */

-	protected T doSwitch(int classifierID, EObject theEObject) {

-		switch (classifierID)

-		{

-		case TestmodelPackage.TEST_ELEMENT: {

-			TestElement testElement = (TestElement) theEObject;

-			T result = caseTestElement(testElement);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP: {

-			@SuppressWarnings("unchecked")

-			Map.Entry<TestElement, String> testElementToStringMap = (Map.Entry<TestElement, String>) theEObject;

-			T result = caseTestElementToStringMap(testElementToStringMap);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.STRING_TO_STRING_MAP: {

-			@SuppressWarnings("unchecked")

-			Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>) theEObject;

-			T result = caseStringToStringMap(stringToStringMap);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP: {

-			@SuppressWarnings("unchecked")

-			Map.Entry<TestElement, TestElement> testElementToTestElementMap = (Map.Entry<TestElement, TestElement>) theEObject;

-			T result = caseTestElementToTestElementMap(testElementToTestElementMap);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP: {

-			@SuppressWarnings("unchecked")

-			Map.Entry<String, TestElement> stringToTestElementMap = (Map.Entry<String, TestElement>) theEObject;

-			T result = caseStringToTestElementMap(stringToTestElementMap);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.TEST_TYPE: {

-			TestType testType = (TestType) theEObject;

-			T result = caseTestType(testType);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT: {

-			TypeWithFeatureMapNonContainment typeWithFeatureMapNonContainment = (TypeWithFeatureMapNonContainment) theEObject;

-			T result = caseTypeWithFeatureMapNonContainment(typeWithFeatureMapNonContainment);

-			if (result == null)

-				result = caseTestType(typeWithFeatureMapNonContainment);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT: {

-			TypeWithFeatureMapContainment typeWithFeatureMapContainment = (TypeWithFeatureMapContainment) theEObject;

-			T result = caseTypeWithFeatureMapContainment(typeWithFeatureMapContainment);

-			if (result == null)

-				result = caseTestType(typeWithFeatureMapContainment);

-			if (result == null)

-				result = defaultCase(theEObject);

-			return result;

-		}

-		default:

-			return defaultCase(theEObject);

-		}

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Test Element</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Test Element</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTestElement(TestElement object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTestElementToStringMap(Map.Entry<TestElement, String> object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String To String Map</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>String To String Map</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringToStringMap(Map.Entry<String, String> object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseStringToTestElementMap(Map.Entry<String, TestElement> object) {

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Test Type</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Test Type</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTestType(TestType object)

-	{

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object)

-	{

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)

-	 * @generated

-	 */

-	public T caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object)

-	{

-		return null;

-	}

-

-	/**

-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * <!-- begin-user-doc -->

-	 * This implementation returns null;

-	 * returning a non-null result will terminate the switch, but this is the last case anyway.

-	 * <!-- end-user-doc -->

-	 * 

-	 * @param object the target of the switch.

-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.

-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)

-	 * @generated

-	 */

-	public T defaultCase(EObject object) {

-		return null;

-	}

-

-} // TestmodelSwitch

+/**
+ * Copyright (c) 2012-2013 EclipseSource Muenchen GmbH and others.
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ * Edgar Mueller - initial API and implementation
+ */
+package org.eclipse.emf.emfstore.test.model.util;
+
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.emfstore.test.model.TestElement;
+import org.eclipse.emf.emfstore.test.model.TestType;
+import org.eclipse.emf.emfstore.test.model.TestmodelPackage;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapContainment;
+import org.eclipse.emf.emfstore.test.model.TypeWithFeatureMapNonContainment;
+
+/**
+ * <!-- begin-user-doc -->
+ * The <b>Switch</b> for the model's inheritance hierarchy.
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each
+ * class of the model,
+ * starting with the actual class of the object
+ * and proceeding up the inheritance hierarchy
+ * until a non-null result is returned,
+ * which is the result of the switch.
+ * <!-- end-user-doc -->
+ * 
+ * @see org.eclipse.emf.emfstore.test.model.TestmodelPackage
+ * @generated
+ */
+public class TestmodelSwitch<T> {
+	/**
+	 * The cached model package
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	protected static TestmodelPackage modelPackage;
+
+	/**
+	 * Creates an instance of the switch.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @generated
+	 */
+	public TestmodelSwitch() {
+		if (modelPackage == null) {
+			modelPackage = TestmodelPackage.eINSTANCE;
+		}
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+	 * result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	public T doSwitch(EObject theEObject) {
+		return doSwitch(theEObject.eClass(), theEObject);
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+	 * result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected T doSwitch(EClass theEClass, EObject theEObject) {
+		if (theEClass.eContainer() == modelPackage) {
+			return doSwitch(theEClass.getClassifierID(), theEObject);
+		}
+		List<EClass> eSuperTypes = theEClass.getESuperTypes();
+		return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
+	}
+
+	/**
+	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that
+	 * result.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * 
+	 * @return the first non-null result returned by a <code>caseXXX</code> call.
+	 * @generated
+	 */
+	protected T doSwitch(int classifierID, EObject theEObject) {
+		switch (classifierID) {
+		case TestmodelPackage.TEST_ELEMENT: {
+			TestElement testElement = (TestElement) theEObject;
+			T result = caseTestElement(testElement);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.TEST_ELEMENT_TO_STRING_MAP: {
+			@SuppressWarnings("unchecked")
+			Map.Entry<TestElement, String> testElementToStringMap = (Map.Entry<TestElement, String>) theEObject;
+			T result = caseTestElementToStringMap(testElementToStringMap);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.STRING_TO_STRING_MAP: {
+			@SuppressWarnings("unchecked")
+			Map.Entry<String, String> stringToStringMap = (Map.Entry<String, String>) theEObject;
+			T result = caseStringToStringMap(stringToStringMap);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.TEST_ELEMENT_TO_TEST_ELEMENT_MAP: {
+			@SuppressWarnings("unchecked")
+			Map.Entry<TestElement, TestElement> testElementToTestElementMap = (Map.Entry<TestElement, TestElement>) theEObject;
+			T result = caseTestElementToTestElementMap(testElementToTestElementMap);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.STRING_TO_TEST_ELEMENT_MAP: {
+			@SuppressWarnings("unchecked")
+			Map.Entry<String, TestElement> stringToTestElementMap = (Map.Entry<String, TestElement>) theEObject;
+			T result = caseStringToTestElementMap(stringToTestElementMap);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.TEST_TYPE: {
+			TestType testType = (TestType) theEObject;
+			T result = caseTestType(testType);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_NON_CONTAINMENT: {
+			TypeWithFeatureMapNonContainment typeWithFeatureMapNonContainment = (TypeWithFeatureMapNonContainment) theEObject;
+			T result = caseTypeWithFeatureMapNonContainment(typeWithFeatureMapNonContainment);
+			if (result == null)
+				result = caseTestType(typeWithFeatureMapNonContainment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case TestmodelPackage.TYPE_WITH_FEATURE_MAP_CONTAINMENT: {
+			TypeWithFeatureMapContainment typeWithFeatureMapContainment = (TypeWithFeatureMapContainment) theEObject;
+			T result = caseTypeWithFeatureMapContainment(typeWithFeatureMapContainment);
+			if (result == null)
+				result = caseTestType(typeWithFeatureMapContainment);
+			if (result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
+		}
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Test Element</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Test Element</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTestElement(TestElement object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Test Element To String Map</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTestElementToStringMap(Map.Entry<TestElement, String> object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String To String Map</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>String To String Map</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringToStringMap(Map.Entry<String, String> object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Test Element To Test Element Map</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTestElementToTestElementMap(Map.Entry<TestElement, TestElement> object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>String To Test Element Map</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseStringToTestElementMap(Map.Entry<String, TestElement> object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Test Type</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Test Type</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTestType(TestType object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Non Containment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTypeWithFeatureMapNonContainment(TypeWithFeatureMapNonContainment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>Type With Feature Map Containment</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+	 * @generated
+	 */
+	public T caseTypeWithFeatureMapContainment(TypeWithFeatureMapContainment object) {
+		return null;
+	}
+
+	/**
+	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * <!-- begin-user-doc -->
+	 * This implementation returns null;
+	 * returning a non-null result will terminate the switch, but this is the last case anyway.
+	 * <!-- end-user-doc -->
+	 * 
+	 * @param object the target of the switch.
+	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
+	 * @generated
+	 */
+	public T defaultCase(EObject object) {
+		return null;
+	}
+
+} // TestmodelSwitch